Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4635759 authored by Sally Yuen's avatar Sally Yuen Committed by Android (Google) Code Review
Browse files

Merge "Reduce Bright Colors feature name update" into sc-dev

parents f686e229 60857ff8

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -4592,7 +4592,7 @@ 
    <string name="color_correction_feature_name">Color Correction</string>



    <!-- Title of Reduce Brightness feature, shown in the warning dialog about the accessibility shortcut. [CHAR LIMIT=none] -->

    <string name="reduce_bright_colors_feature_name">Reduce brightness</string>

    <string name="reduce_bright_colors_feature_name">Extra dim</string>



    <!-- Text in toast to alert the user that the accessibility shortcut turned on an accessibility service. [CHAR LIMIT=none] -->

    <string name="accessibility_shortcut_enabling_service">Held volume keys. <xliff:g id="service_name" example="TalkBack">%1$s</xliff:g> turned on.</string>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -3390,6 +3390,8 @@ 
  <java-symbol type="drawable" name="ic_accessibility_color_correction" />

  <java-symbol type="drawable" name="ic_accessibility_magnification" />



  <java-symbol type="string" name="reduce_bright_colors_feature_name" />



  <!-- com.android.internal.widget.RecyclerView -->

  <java-symbol type="id" name="item_touch_helper_previous_elevation"/>

  <java-symbol type="dimen" name="item_touch_helper_max_drag_scroll_per_frame"/>

packages/SystemUI/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -958,8 +958,6 @@ 
    <string name="quick_settings_dark_mode_secondary_label_on_at">On at <xliff:g id="time" example="10 pm">%s</xliff:g></string>

    <!-- QuickSettings: Secondary text for when the Dark theme or some other tile will be on until some user-selected time. [CHAR LIMIT=20] -->

    <string name="quick_settings_dark_mode_secondary_label_until">Until <xliff:g id="time" example="7 am">%s</xliff:g></string>

    <!-- QuickSettings: Label for the toggle that controls whether Reduce Brightness is enabled. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_reduce_bright_colors_label">Reduce brightness</string>



    <!-- QuickSettings: NFC tile [CHAR LIMIT=NONE] -->

    <string name="quick_settings_nfc_label">NFC</string>

packages/SystemUI/src/com/android/systemui/qs/tiles/ReduceBrightColorsTile.java

+3 −3
Original line number Diff line number Diff line
@@ -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<QSTile.BooleanState> 


    @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;

    }

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ReduceBrightColorsTileTest.java

+3 −3
Original line number Diff line number Diff line
@@ -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