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

Commit c3102335 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update text color of misalignment message" into rvc-dev am: 1945ee56... 

Merge "Update text color of misalignment message" into rvc-dev am: 1945ee56 am: 799366c5 am: b3c27dbd

Change-Id: I9899907bb84572cda178ebf59accb353b4d31326
parents 9078cd58 b3c27dbd

packages/SystemUI/res/values/colors.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -250,4 +250,7 @@ 
    <color name="control_enabled_thermo_heat_background">@color/GM2_red_200</color>

    <color name="control_enabled_thermo_heat_background">@color/GM2_red_200</color>

    <color name="control_enabled_thermo_cool_background">@color/GM2_blue_200</color>

    <color name="control_enabled_thermo_cool_background">@color/GM2_blue_200</color>

    <color name="control_enabled_default_background">@color/GM2_blue_200</color>

    <color name="control_enabled_default_background">@color/GM2_blue_200</color>



    <!-- Docked misalignment message -->

    <color name="misalignment_text_color">#F28B82</color>

</resources>
 
</resources>

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -311,7 +311,7 @@ public class KeyguardIndicationController implements StateListener, 
                    mTextView.switchIndication(mTransientIndication);

                    mTextView.switchIndication(mTransientIndication);

                } else if (!TextUtils.isEmpty(mAlignmentIndication)) {

                } else if (!TextUtils.isEmpty(mAlignmentIndication)) {

                    mTextView.switchIndication(mAlignmentIndication);

                    mTextView.switchIndication(mAlignmentIndication);

                    mTextView.setTextColor(Utils.getColorError(mContext));

                    mTextView.setTextColor(mContext.getColor(R.color.misalignment_text_color));

                } else if (mPowerPluggedIn) {

                } else if (mPowerPluggedIn) {

                    String indication = computePowerIndication();

                    String indication = computePowerIndication();

                    if (animate) {

                    if (animate) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -193,7 +193,7 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
        assertThat(mTextView.getText()).isEqualTo(

        assertThat(mTextView.getText()).isEqualTo(

                mContext.getResources().getString(R.string.dock_alignment_slow_charging));

                mContext.getResources().getString(R.string.dock_alignment_slow_charging));

        assertThat(mTextView.getCurrentTextColor()).isEqualTo(

        assertThat(mTextView.getCurrentTextColor()).isEqualTo(

                Utils.getColorError(mContext).getDefaultColor());

                mContext.getColor(R.color.misalignment_text_color));

    }

    }





    @Test

    @Test
@@ -211,7 +211,7 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
        assertThat(mTextView.getText()).isEqualTo(

        assertThat(mTextView.getText()).isEqualTo(

                mContext.getResources().getString(R.string.dock_alignment_not_charging));

                mContext.getResources().getString(R.string.dock_alignment_not_charging));

        assertThat(mTextView.getCurrentTextColor()).isEqualTo(

        assertThat(mTextView.getCurrentTextColor()).isEqualTo(

                Utils.getColorError(mContext).getDefaultColor());

                mContext.getColor(R.color.misalignment_text_color));

    }

    }





    @Test

    @Test