Merge "Set storage volume spinner not clickable when only 1 volume" into sc-dev am: 2853e766f5 am: 92bf5c4876

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495884

Change-Id: Ic03dc14a4040135f2dc870e34de9a431faf3a70c
This commit is contained in:
TreeHugger Robot
2021-05-12 03:43:04 +00:00
committed by Automerger Merge Worker

View File

@@ -73,6 +73,10 @@ public class StorageSelectionPreferenceController extends BasePreferenceControll
Collections.sort(mStorageEntries); Collections.sort(mStorageEntries);
mStorageEntries.addAll(storageEntries); mStorageEntries.addAll(storageEntries);
mStorageAdapter.addAll(storageEntries); mStorageAdapter.addAll(storageEntries);
if (mSpinnerPreference != null) {
mSpinnerPreference.setClickable(mStorageAdapter.getCount() > 1);
}
} }
/** set selected storage in the spinner. */ /** set selected storage in the spinner. */
@@ -93,6 +97,7 @@ public class StorageSelectionPreferenceController extends BasePreferenceControll
mSpinnerPreference = screen.findPreference(getPreferenceKey()); mSpinnerPreference = screen.findPreference(getPreferenceKey());
mSpinnerPreference.setAdapter(mStorageAdapter); mSpinnerPreference.setAdapter(mStorageAdapter);
mSpinnerPreference.setOnItemSelectedListener(this); mSpinnerPreference.setOnItemSelectedListener(this);
mSpinnerPreference.setClickable(mStorageAdapter.getCount() > 1);
} }
@Override @Override