Reset development tile values when turning off dev option. (7987ccff) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/development/qstile/DevelopmentTiles.java

+17 −3

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import android.view.WindowManagerGlobal;
		import android.widget.Toast;

		import com.android.internal.app.LocalePicker;
		import com.android.settingslib.development.DevelopmentSettingsEnabler;
		import com.android.settingslib.development.SystemPropPoker;

		public abstract class DevelopmentTiles extends TileService {
		@@ -50,7 +51,18 @@ public abstract class DevelopmentTiles extends TileService {
		}

		public void refresh() {
		getQsTile().setState(isEnabled() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE);
		final int state;
		if (!DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)) {
		// Reset to disabled state if dev option is off.
		if (isEnabled()) {
		setIsEnabled(false);
		SystemPropPoker.getInstance().poke();
		}
		state = Tile.STATE_UNAVAILABLE;
		} else {
		state = isEnabled() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
		}
		getQsTile().setState(state);
		getQsTile().updateTile();
		}

		@@ -124,7 +136,8 @@ public abstract class DevelopmentTiles extends TileService {
		IWindowManager wm = WindowManagerGlobal.getWindowManagerService();
		try {
		return wm.getAnimationScale(0) != 1;
		} catch (RemoteException e) { }
		} catch (RemoteException e) {
		}
		return false;
		}

		@@ -136,7 +149,8 @@ public abstract class DevelopmentTiles extends TileService {
		wm.setAnimationScale(0, scale);
		wm.setAnimationScale(1, scale);
		wm.setAnimationScale(2, scale);
		} catch (RemoteException e) { }
		} catch (RemoteException e) {
		}
		}
		}

tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java

0 → 100644

+58 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.development.qstile;

		import static com.google.common.truth.Truth.assertThat;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.spy;

		import android.service.quicksettings.Tile;

		import com.android.settings.testutils.SettingsRobolectricTestRunner;
		import com.android.settingslib.development.DevelopmentSettingsEnabler;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.Robolectric;

		@RunWith(SettingsRobolectricTestRunner.class)
		public class DevelopmentTilesTest {

		@Mock
		private Tile mTile;
		private DevelopmentTiles mService;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mService = spy(Robolectric.setupService(DevelopmentTiles.ShowLayout.class));
		doReturn(mTile).when(mService).getQsTile();
		}

		@Test
		public void refresh_devOptionIsDisabled_shouldResetTileValue() {
		DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mService, false);
		mService.setIsEnabled(true);

		mService.refresh();

		assertThat(mService.isEnabled()).isFalse();
		}
		}