PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide "Remove" menu & the drag handle when there\'s just one locale" into nyc-dev

Browse Source 
am: 70fd5d0ecc

* commit '70fd5d0ecc29630ba79f25038234a0f6b56effd4':
  Hide "Remove" menu & the drag handle when there's just one locale
This commit is contained in:
Mihai Nita
2016-03-09 01:20:59 +00:00
committed by android-build-merger
parent 3fd9a62b39 70fd5d0ecc
commit dd56043bac
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
View File

@@ -153,7 +153,7 @@ class LocaleDragAndDropAdapter
dragCell.setMiniLabel(mNumberFormatter.format(i + 1)); dragCell.setMiniLabel(mNumberFormatter.format(i + 1));
dragCell.setShowCheckbox(mRemoveMode); dragCell.setShowCheckbox(mRemoveMode);
dragCell.setShowMiniLabel(!mRemoveMode); dragCell.setShowMiniLabel(!mRemoveMode);
dragCell.setShowHandle(!mRemoveMode); dragCell.setShowHandle(!mRemoveMode && mDragEnabled);
dragCell.setChecked(false); dragCell.setChecked(false);
dragCell.setTag(feedItem); dragCell.setTag(feedItem);
dragCell.getCheckbox() dragCell.getCheckbox()

13
src/com/android/settings/localepicker/LocaleListEditor.java
View File

@@ -67,7 +67,7 @@ public class LocaleListEditor extends SettingsPreferenceFragment
setHasOptionsMenu(true); setHasOptionsMenu(true);
LocaleStore.fillCache(this.getContext()); LocaleStore.fillCache(this.getContext());
List<LocaleStore.LocaleInfo> feedsList = getUserLocaleList(this.getContext()); final List<LocaleStore.LocaleInfo> feedsList = getUserLocaleList(this.getContext());
mAdapter = new LocaleDragAndDropAdapter(this.getContext(), feedsList); mAdapter = new LocaleDragAndDropAdapter(this.getContext(), feedsList);
} }
@@ -144,6 +144,7 @@ public class LocaleListEditor extends SettingsPreferenceFragment
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
mAdapter.removeChecked(); mAdapter.removeChecked();
setRemoveMode(!mRemoveMode); setRemoveMode(!mRemoveMode);
updateVisibilityOfRemoveMenu();
} }
}) })
.create() .create()
@@ -158,6 +159,7 @@ public class LocaleListEditor extends SettingsPreferenceFragment
menuItem.setIcon(R.drawable.ic_delete); menuItem.setIcon(R.drawable.ic_delete);
super.onCreateOptionsMenu(menu, inflater); super.onCreateOptionsMenu(menu, inflater);
mMenu = menu; mMenu = menu;
updateVisibilityOfRemoveMenu();
} }
private static List<LocaleStore.LocaleInfo> getUserLocaleList(Context context) { private static List<LocaleStore.LocaleInfo> getUserLocaleList(Context context) {
@@ -201,6 +203,15 @@ public class LocaleListEditor extends SettingsPreferenceFragment
@Override @Override
public void onLocaleSelected(LocaleStore.LocaleInfo locale) { public void onLocaleSelected(LocaleStore.LocaleInfo locale) {
mAdapter.addLocale(locale); mAdapter.addLocale(locale);
updateVisibilityOfRemoveMenu();
} }
// Hide the "Remove" menu if there is only one locale in the list, show it otherwise
// This is called when the menu is first created, and then one add / remove locale
private void updateVisibilityOfRemoveMenu() {
final MenuItem menuItemRemove = mMenu.findItem(MENU_ID_REMOVE);
if (menuItemRemove != null) {
menuItemRemove.setVisible(mAdapter.getItemCount() > 1);
}
}
} }