diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 0228dfd45972d..7ea762c2fbbb3 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4592,7 +4592,7 @@ Color Correction - Reduce brightness + Extra dim Held volume keys. %1$s turned on. diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 0f834933ab708..dad886de6cf61 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3390,6 +3390,8 @@ + + diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 685896523e361..691d111089b8f 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -958,8 +958,6 @@ On at %s Until %s - - Reduce brightness NFC diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ReduceBrightColorsTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ReduceBrightColorsTile.java index 479be659ba107..03a6689bc4493 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ReduceBrightColorsTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ReduceBrightColorsTile.java @@ -25,8 +25,8 @@ import android.provider.Settings; import android.service.quicksettings.Tile; import android.widget.Switch; +import com.android.internal.R; import com.android.internal.logging.MetricsLogger; -import com.android.systemui.R; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.ActivityStarter; @@ -98,14 +98,14 @@ public class ReduceBrightColorsTile extends QSTileImpl @Override public CharSequence getTileLabel() { - return mContext.getString(R.string.quick_settings_reduce_bright_colors_label); + return mContext.getString(R.string.reduce_bright_colors_feature_name); } @Override protected void handleUpdateState(BooleanState state, Object arg) { state.value = mReduceBrightColorsController.isReduceBrightColorsActivated(); state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; - state.label = mContext.getString(R.string.quick_settings_reduce_bright_colors_label); + state.label = mContext.getString(R.string.reduce_bright_colors_feature_name); state.expandedAccessibilityClassName = Switch.class.getName(); state.contentDescription = state.label; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ReduceBrightColorsTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ReduceBrightColorsTileTest.java index 6032e51ab5544..979951409aa91 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ReduceBrightColorsTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ReduceBrightColorsTileTest.java @@ -30,8 +30,8 @@ import android.testing.TestableLooper; import androidx.test.filters.SmallTest; +import com.android.internal.R; import com.android.internal.logging.MetricsLogger; -import com.android.systemui.R; import com.android.systemui.SysuiTestCase; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.plugins.ActivityStarter; @@ -99,7 +99,7 @@ public class ReduceBrightColorsTileTest extends SysuiTestCase { assertEquals(Tile.STATE_INACTIVE, mTile.getState().state); assertEquals(mTile.getState().label.toString(), - mContext.getString(R.string.quick_settings_reduce_bright_colors_label)); + mContext.getString(R.string.reduce_bright_colors_feature_name)); } @Test @@ -110,7 +110,7 @@ public class ReduceBrightColorsTileTest extends SysuiTestCase { assertEquals(Tile.STATE_ACTIVE, mTile.getState().state); assertEquals(mTile.getState().label.toString(), - mContext.getString(R.string.quick_settings_reduce_bright_colors_label)); + mContext.getString(R.string.reduce_bright_colors_feature_name)); } @Test