From 65d3f456063766e55a57fa585068123525d38011 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Tue, 11 May 2021 18:05:54 +0800 Subject: [PATCH] Set storage volume spinner not clickable when only 1 volume Bug: 187801712 Test: manual Click the spinner when there is only default volume. Click the spinner when there is USB drive connected. Change-Id: Ifbd26c96f467757ffcfef750bd80533834123f82 --- .../storage/StorageSelectionPreferenceController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java index 03fddecea56..ef5305a869c 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSelectionPreferenceController.java @@ -73,6 +73,10 @@ public class StorageSelectionPreferenceController extends BasePreferenceControll Collections.sort(mStorageEntries); mStorageEntries.addAll(storageEntries); mStorageAdapter.addAll(storageEntries); + + if (mSpinnerPreference != null) { + mSpinnerPreference.setClickable(mStorageAdapter.getCount() > 1); + } } /** set selected storage in the spinner. */ @@ -93,6 +97,7 @@ public class StorageSelectionPreferenceController extends BasePreferenceControll mSpinnerPreference = screen.findPreference(getPreferenceKey()); mSpinnerPreference.setAdapter(mStorageAdapter); mSpinnerPreference.setOnItemSelectedListener(this); + mSpinnerPreference.setClickable(mStorageAdapter.getCount() > 1); } @Override