summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/search
diff options
context:
space:
mode:
authorRaff Tsai <rafftsai@google.com>2019-11-15 11:02:25 +0800
committerRaff Tsai <rafftsai@google.com>2019-11-18 18:18:29 +0800
commit84327f6aa39b4b029af7622e596d5e5da59a28b6 (patch)
tree10f936d857deb179bf654b36dfee05ea83ecc68c /src/com/android/settings/search
parentdee1548f61f9df55902e42dfcac698434728804b (diff)
downloadpackages_apps_Settings-84327f6aa39b4b029af7622e596d5e5da59a28b6.tar.gz
packages_apps_Settings-84327f6aa39b4b029af7622e596d5e5da59a28b6.tar.bz2
packages_apps_Settings-84327f6aa39b4b029af7622e596d5e5da59a28b6.zip
Add storage_summary_donut above ProfileSelectStorageFragment
- Modify ProfileSelectFragment to support add preference xml in the top, and tabLayout below the preferences. Base preference layout is dummy_preference_screen.xml which contains no preference. ProfileSelectStorageFragment contains StorageSummaryDonutPreference above the tabLayout. - Make StorageSummaryDonutPreferenceController self workable without StorageDashboardFragment dependence. - Rename inactive_apps.xml to dummy_preference_screen.xml - Move ShadowPrivateStorageInfo from LowStorageSliceTest Bug: 141601408 Test: manual Change-Id: Ide12840dc81bb104f328e230ecda5d35bba01d7a
Diffstat (limited to 'src/com/android/settings/search')
-rw-r--r--src/com/android/settings/search/actionbar/SearchMenuController.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java
index 0243c0963a..9e22bbffa5 100644
--- a/src/com/android/settings/search/actionbar/SearchMenuController.java
+++ b/src/com/android/settings/search/actionbar/SearchMenuController.java
@@ -42,6 +42,7 @@ import com.google.android.setupcompat.util.WizardManagerHelper;
public class SearchMenuController implements LifecycleObserver, OnCreateOptionsMenu {
public static final String NEED_SEARCH_ICON_IN_ACTION_BAR = "need_search_icon_in_action_bar";
+ public static final int MENU_SEARCH = Menu.FIRST + 10;
private final Fragment mHost;
private final int mPageId;
@@ -80,7 +81,11 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM
if (arguments != null && !arguments.getBoolean(NEED_SEARCH_ICON_IN_ACTION_BAR, true)) {
return;
}
- final MenuItem searchItem = menu.add(Menu.NONE, Menu.NONE, 0 /* order */,
+ // menu contains search item, skip it
+ if (menu.findItem(MENU_SEARCH) != null) {
+ return;
+ }
+ final MenuItem searchItem = menu.add(Menu.NONE, MENU_SEARCH, 0 /* order */,
R.string.search_menu);
searchItem.setIcon(R.drawable.ic_search_24dp);
searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);