summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-03-17 15:47:24 -0700
committerAndrew Lee <anwlee@google.com>2015-03-25 15:02:40 -0700
commit467de3dc2be8fa6c815782852f47a752eb77a6dc (patch)
treef45a291f128b3e8d5c5e7822fdc8cc721f382a24
parent02c36528f064b1eafbd4e2432a6e09937fa5f703 (diff)
Make menu options protected instead of private.
Thsi allows Google Dialer to add a feedback option and handle its behavior accordingly. Bug: 19254693 Change-Id: I64ab34049406d10f53504af8d5eda9ac29758ef8
-rw-r--r--res/menu/dialtacts_options.xml4
-rw-r--r--src/com/android/dialer/DialtactsActivity.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml
index cc5e3868e..8a9e25f7f 100644
--- a/res/menu/dialtacts_options.xml
+++ b/res/menu/dialtacts_options.xml
@@ -30,6 +30,6 @@
android:title="@string/menu_newContact"/>
<item
android:id="@+id/menu_call_settings"
- android:title="@string/dialer_settings_label"
- android:orderInCategory="2" />
+ android:title="@string/dialer_settings_label" />
+
</menu>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 61aeed5b0..787b6fae4 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -238,7 +238,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
*/
private String mVoiceSearchQuery;
- private class OptionsPopupMenu extends PopupMenu {
+ protected class OptionsPopupMenu extends PopupMenu {
public OptionsPopupMenu(Context context, View anchor) {
super(context, anchor, Gravity.END);
}
@@ -808,7 +808,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
}
}
- private OptionsPopupMenu buildOptionsMenu(View invoker) {
+ protected OptionsPopupMenu buildOptionsMenu(View invoker) {
final OptionsPopupMenu popupMenu = new OptionsPopupMenu(this, invoker);
popupMenu.inflate(R.menu.dialtacts_options);
final Menu menu = popupMenu.getMenu();