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

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

Merge "Make alignment indication red again" into rvc-dev am: ef84b9a1 

Change-Id: Ic6298da4803f5a5056f8db45974ddcf08e1653d5
parents f2f11e83 ef84b9a1

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -311,6 +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));

                } 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

+4 −2
Original line number Original line Diff line number Diff line
@@ -192,7 +192,8 @@ 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(Color.WHITE);

        assertThat(mTextView.getCurrentTextColor()).isEqualTo(

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

    }

    }





    @Test

    @Test
@@ -209,7 +210,8 @@ 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(Color.WHITE);

        assertThat(mTextView.getCurrentTextColor()).isEqualTo(

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

    }

    }





    @Test

    @Test