diff options
author | Andrew Lee <anwlee@google.com> | 2015-03-26 18:26:32 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-26 18:27:09 +0000 |
commit | b6fc8fb54e7027ca7a01e6b98a8edbe330f310d8 (patch) | |
tree | d3f80606aa47668b28d3b7b87c7a3063cd43bb02 | |
parent | 826185d6926f6087ccca191c50c62f47c6cc3c8a (diff) | |
parent | 467de3dc2be8fa6c815782852f47a752eb77a6dc (diff) |
Merge "Make menu options protected instead of private."
-rw-r--r-- | res/menu/dialtacts_options.xml | 4 | ||||
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 4 |
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(); |