+ * This will only create {@link AutoAddSetting} objects for those tiles that have not been + * auto-added before, and set the corresponding {@link ContentObserver} to listening. + */ + private void populateSettingsList() { + String [] autoAddList; + try { + autoAddList = mContext.getResources().getStringArray( + R.array.config_quickSettingsAutoAdd); + } catch (Resources.NotFoundException e) { + Log.w(TAG, "Missing config resource"); + return; + } + // getStringArray returns @NotNull, so if we got here, autoAddList is not null + for (String tile : autoAddList) { + String[] split = tile.split(SETTING_SEPARATOR); + if (split.length == 2) { + String setting = split[0]; + String spec = split[1]; + if (!mAutoTracker.isAdded(spec)) { + AutoAddSetting s = new AutoAddSetting(mContext, mHandler, setting, spec); + mAutoAddSettingList.add(s); + s.setListening(true); + } + } else { + Log.w(TAG, "Malformed item in array: " + tile); + } + } } public void unmarkTileAsAutoAdded(String tabSpec) { @@ -139,8 +168,6 @@ public class AutoTileManager { } }; - private SecureSetting mColorsSetting; - private final DataSaverController.Listener mDataSaverListener = new Listener() { @Override public void onDataSaverChanged(boolean isDataSaving) { @@ -213,4 +240,47 @@ public class AutoTileManager { } } }; + + @VisibleForTesting + protected SecureSetting getSecureSettingForKey(String key) { + for (SecureSetting s : mAutoAddSettingList) { + if (Objects.equals(key, s.getKey())) { + return s; + } + } + return null; + } + + /** + * Tracks tiles that should be auto added when a setting changes. + *
+ * When the setting changes to a value different from 0, if the tile has not been auto added + * before, it will be added and the listener will be stopped. + */ + private class AutoAddSetting extends SecureSetting { + private final String mSpec; + + AutoAddSetting(Context context, Handler handler, String setting, String tileSpec) { + super(context, handler, setting); + mSpec = tileSpec; + } + + @Override + protected void handleValueChanged(int value, boolean observedChange) { + if (mAutoTracker.isAdded(mSpec)) { + // This should not be listening anymore + mHandler.post(() -> setListening(false)); + return; + } + if (value != 0) { + if (mSpec.startsWith(CustomTile.PREFIX)) { + mHost.addTile(CustomTile.getComponentFromSpec(mSpec)); + } else { + mHost.addTile(mSpec); + } + mAutoTracker.setTileAdded(mSpec); + mHandler.post(() -> setListening(false)); + } + } + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java index 966fa88653bff..11477395a7813 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSTileHostTest.java @@ -122,11 +122,6 @@ public class QSTileHostTest extends SysuiTestCase { mBroadcastDispatcher, mStatusBar, mQSLogger, mUiEventLogger); setUpTileFactory(); - // Override this config so there are no unexpected tiles - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.string.config_defaultExtraQuickSettingsTiles, - ""); - Settings.Secure.putStringForUser(mContext.getContentResolver(), QSTileHost.TILES_SETTING, "", ActivityManager.getCurrentUser()); } @@ -209,34 +204,6 @@ public class QSTileHostTest extends SysuiTestCase { verify(mQSLogger).logTileAdded("spec1"); } - @Test - public void testDefaultAndExtra() { - mContext.getOrCreateTestableResources() - .addOverride(R.string.quick_settings_tiles_default, "spec1"); - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.string.config_defaultExtraQuickSettingsTiles, "spec2"); - mQSTileHost.onTuningChanged(QSTileHost.TILES_SETTING, "default"); - assertEquals(2, mQSTileHost.getTiles().size()); - QSTile[] elements = mQSTileHost.getTiles().toArray(new QSTile[0]); - assertTrue(elements[0] instanceof TestTile1); - assertTrue(elements[1] instanceof TestTile2); - - verify(mQSLogger).logTileAdded("spec1"); - verify(mQSLogger).logTileAdded("spec2"); - } - - @Test - public void testExtraCustom() { - mContext.getOrCreateTestableResources().addOverride( - com.android.internal.R.string.config_defaultExtraQuickSettingsTiles, - CUSTOM_TILE_SPEC); - mQSTileHost.onTuningChanged(QSTileHost.TILES_SETTING, "default"); - assertEquals(1, mQSTileHost.getTiles().size()); - assertEquals(mCustomTile, CollectionUtils.firstOrNull(mQSTileHost.getTiles())); - - verify(mQSLogger).logTileAdded(CUSTOM_TILE_SPEC); - } - @Test public void testNoRepeatedSpecs_addTile() { mQSTileHost.onTuningChanged(QSTileHost.TILES_SETTING, "spec1,spec2"); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java index 67ad37b2d29a8..1a6921a1d136a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java @@ -20,19 +20,24 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import android.content.ComponentName; import android.hardware.display.ColorDisplayManager; import android.hardware.display.NightDisplayListener; import android.os.Handler; +import android.provider.Settings; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; import androidx.test.filters.SmallTest; +import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.qs.AutoAddTracker; import com.android.systemui.qs.QSTileHost; +import com.android.systemui.qs.SecureSetting; import com.android.systemui.statusbar.policy.CastController; import com.android.systemui.statusbar.policy.CastController.CastDevice; import com.android.systemui.statusbar.policy.DataSaverController; @@ -52,6 +57,13 @@ import java.util.List; @SmallTest public class AutoTileManagerTest extends SysuiTestCase { + private static final String TEST_SETTING = "setting"; + private static final String TEST_SPEC = "spec"; + private static final String TEST_SETTING_COMPONENT = "setting_component"; + private static final String TEST_COMPONENT = "test_pkg/test_cls"; + private static final String TEST_CUSTOM_SPEC = "custom(" + TEST_COMPONENT + ")"; + private static final String SEPARATOR = AutoTileManager.SETTING_SEPARATOR; + @Mock private QSTileHost mQsTileHost; @Mock private AutoAddTracker mAutoAddTracker; @Mock private CastController mCastController; @@ -61,7 +73,20 @@ public class AutoTileManagerTest extends SysuiTestCase { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - mAutoTileManager = new AutoTileManager(mContext, mAutoAddTracker, mQsTileHost, + + mContext.getOrCreateTestableResources().addOverride( + R.array.config_quickSettingsAutoAdd, + new String[] { + TEST_SETTING + SEPARATOR + TEST_SPEC, + TEST_SETTING_COMPONENT + SEPARATOR + TEST_CUSTOM_SPEC + } + ); + + mAutoTileManager = createAutoTileManager(); + } + + private AutoTileManager createAutoTileManager() { + return new AutoTileManager(mContext, mAutoAddTracker, mQsTileHost, Handler.createAsync(TestableLooper.get(this).getLooper()), mock(HotspotController.class), mock(DataSaverController.class), @@ -137,4 +162,72 @@ public class AutoTileManagerTest extends SysuiTestCase { mAutoTileManager.mCastCallback.onCastDevicesChanged(); verify(mQsTileHost, never()).addTile("cast"); } + + @Test + public void testSettingTileAdded_onChanged() { + changeValue(TEST_SETTING, 1); + waitForIdleSync(); + verify(mAutoAddTracker).setTileAdded(TEST_SPEC); + verify(mQsTileHost).addTile(TEST_SPEC); + } + + @Test + public void testSettingTileAddedComponent_onChanged() { + changeValue(TEST_SETTING_COMPONENT, 1); + waitForIdleSync(); + verify(mAutoAddTracker).setTileAdded(TEST_CUSTOM_SPEC); + verify(mQsTileHost).addTile(ComponentName.unflattenFromString(TEST_COMPONENT)); + } + + @Test + public void testSettingTileAdded_onlyOnce() { + changeValue(TEST_SETTING, 1); + waitForIdleSync(); + TestableLooper.get(this).processAllMessages(); + changeValue(TEST_SETTING, 2); + waitForIdleSync(); + verify(mAutoAddTracker).setTileAdded(TEST_SPEC); + verify(mQsTileHost).addTile(TEST_SPEC); + } + + @Test + public void testSettingTileNotAdded_onChangedTo0() { + changeValue(TEST_SETTING, 0); + waitForIdleSync(); + verify(mAutoAddTracker, never()).setTileAdded(TEST_SPEC); + verify(mQsTileHost, never()).addTile(TEST_SPEC); + } + + @Test + public void testSettingTileNotAdded_ifPreviouslyAdded() { + when(mAutoAddTracker.isAdded(TEST_SPEC)).thenReturn(true); + + changeValue(TEST_SETTING, 1); + waitForIdleSync(); + verify(mAutoAddTracker, never()).setTileAdded(TEST_SPEC); + verify(mQsTileHost, never()).addTile(TEST_SPEC); + } + + @Test + public void testEmptyArray_doesNotCrash() { + mContext.getOrCreateTestableResources().addOverride( + R.array.config_quickSettingsAutoAdd, new String[0]); + createAutoTileManager(); + } + + @Test + public void testMissingConfig_doesNotCrash() { + mContext.getOrCreateTestableResources().addOverride( + R.array.config_quickSettingsAutoAdd, null); + createAutoTileManager(); + } + + // Will only notify if it's listening + private void changeValue(String key, int value) { + SecureSetting s = mAutoTileManager.getSecureSettingForKey(key); + Settings.Secure.putInt(mContext.getContentResolver(), key, value); + if (s != null && s.isListening()) { + s.onChange(false); + } + } }