Merge "Cleanup of the QS Longpress effect flag" into main (16357e24) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -622,13 +622,6 @@ flag {
		bug: "315274804"
		}

		flag {
		name: "quick_settings_visual_haptics_longpress"
		namespace: "systemui"
		description: "Enable special visual and haptic effects for quick settings tiles with long-press actions"
		bug: "229856884"
		}

		flag {
		name: "switch_user_on_bg"
		namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/QSPanelControllerBaseTest.java

+1 −14

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.systemui.qs;

		import static com.android.systemui.Flags.FLAG_QUICK_SETTINGS_VISUAL_HAPTICS_LONGPRESS;
		import static com.android.systemui.flags.SceneContainerFlagParameterizationKt.parameterizeSceneContainerFlag;

		import static com.google.common.truth.Truth.assertThat;
		@@ -41,8 +40,6 @@ import static kotlinx.coroutines.flow.StateFlowKt.MutableStateFlow;

		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.flag.junit.FlagsParameterization;
		import android.testing.TestableLooper.RunWithLooper;
		import android.view.ContextThemeWrapper;
		@@ -87,6 +84,7 @@ import javax.inject.Provider;

		import kotlinx.coroutines.flow.MutableStateFlow;
		import kotlinx.coroutines.flow.StateFlow;

		import platform.test.runner.parameterized.ParameterizedAndroidJunit4;
		import platform.test.runner.parameterized.Parameters;

		@@ -505,7 +503,6 @@ public class QSPanelControllerBaseTest extends SysuiTestCase {
		}

		@Test
		@EnableFlags(FLAG_QUICK_SETTINGS_VISUAL_HAPTICS_LONGPRESS)
		public void setTiles_longPressEffectEnabled_nonNullLongPressEffectsAreProvided() {
		mLongPressEffectProvider.mEffectsProvided = 0;
		when(mQSHost.getTiles()).thenReturn(List.of(mQSTile, mOtherTile));
		@@ -515,16 +512,6 @@ public class QSPanelControllerBaseTest extends SysuiTestCase {
		assertThat(mLongPressEffectProvider.mEffectsProvided).isEqualTo(2);
		}

		@Test
		@DisableFlags(FLAG_QUICK_SETTINGS_VISUAL_HAPTICS_LONGPRESS)
		public void setTiles_longPressEffectDisabled_noLongPressEffectsAreProvided() {
		mLongPressEffectProvider.mEffectsProvided = 0;
		when(mQSHost.getTiles()).thenReturn(List.of(mQSTile, mOtherTile));
		mController.setTiles();

		assertThat(mLongPressEffectProvider.mEffectsProvided).isEqualTo(0);
		}

		@Test
		public void setTiles_differentTiles_extraTileRemoved() {
		when(mQSHost.getTiles()).thenReturn(List.of(mQSTile, mOtherTile));

packages/SystemUI/src/com/android/systemui/qs/QSPanelControllerBase.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.systemui.qs;

		import static com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import static com.android.systemui.Flags.quickSettingsVisualHapticsLongpress;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -364,12 +363,7 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
		}

		private void addTile(final QSTile tile, boolean collapsedView) {
		QSLongPressEffect longPressEffect;
		if (quickSettingsVisualHapticsLongpress()) {
		longPressEffect = mLongPressEffectProvider.get();
		} else {
		longPressEffect = null;
		}
		QSLongPressEffect longPressEffect = mLongPressEffectProvider.get();
		final QSTileViewImpl tileView = new QSTileViewImpl(
		getContext(), collapsedView, longPressEffect);
		final TileRecord r = new TileRecord(tile, tileView);