From 940e92ab37eef5b6ebc7d2b420d58e922b28e96f Mon Sep 17 00:00:00 2001 From: menghanli Date: Fri, 24 Dec 2021 12:11:46 +0800 Subject: [PATCH] Remove the unused variables and @deprecated function in Color Inversion quick settings - SlashState is not used anymore - composeChangeAnnouncement is @deprecated function and not used anymore - Unused variables Bug: 211937943 Test: manually test color inversion quick settings tile actions Test: atest SystemUITests Change-Id: I4c235d1e80993d712f2895e8fa1ea0dcfe01d7e9 --- packages/SystemUI/res/values/strings.xml | 4 ---- .../systemui/qs/tiles/ColorInversionTile.java | 21 ------------------- 2 files changed, 25 deletions(-) diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index d2ea06709fe55..12c5dc7fa03d4 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -465,10 +465,6 @@ Flashlight turned off. Flashlight turned on. - - Color inversion turned off. - - Color inversion turned on. Mobile hotspot turned off. diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java index d2d2180bfa879..c2a82a76d3e84 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java @@ -49,15 +49,9 @@ import javax.inject.Inject; /** Quick settings tile: Invert colors **/ public class ColorInversionTile extends QSTileImpl { - private static final String EXTRA_FRAGMENT_ARGS_KEY = ":settings:fragment_args_key"; - private static final String EXTRA_SHOW_FRAGMENT_ARGS_KEY = ":settings:show_fragment_args"; - private static final String COLOR_INVERSION_PREFERENCE_KEY = "toggle_inversion_preference"; - private final Icon mIcon = ResourceIcon.get(drawable.ic_invert_colors); private final SettingObserver mSetting; - private boolean mListening; - @Inject public ColorInversionTile( QSHost host, @@ -126,11 +120,7 @@ public class ColorInversionTile extends QSTileImpl { protected void handleUpdateState(BooleanState state, Object arg) { final int value = arg instanceof Integer ? (Integer) arg : mSetting.getValue(); final boolean enabled = value != 0; - if (state.slash == null) { - state.slash = new SlashState(); - } state.value = enabled; - state.slash.isSlashed = !state.value; state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; state.label = mContext.getString(R.string.quick_settings_inversion_label); state.icon = mIcon; @@ -142,15 +132,4 @@ public class ColorInversionTile extends QSTileImpl { public int getMetricsCategory() { return MetricsEvent.QS_COLORINVERSION; } - - @Override - protected String composeChangeAnnouncement() { - if (mState.value) { - return mContext.getString( - R.string.accessibility_quick_settings_color_inversion_changed_on); - } else { - return mContext.getString( - R.string.accessibility_quick_settings_color_inversion_changed_off); - } - } }