Merge "Make alignment indication red again" into rvc-dev am: ef84b9a1c5 (737a6885) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -311,6 +311,7 @@ public class KeyguardIndicationController implements StateListener,
		mTextView.switchIndication(mTransientIndication);
		} else if (!TextUtils.isEmpty(mAlignmentIndication)) {
		mTextView.switchIndication(mAlignmentIndication);
		mTextView.setTextColor(Utils.getColorError(mContext));
		} else if (mPowerPluggedIn) {
		String indication = computePowerIndication();
		if (animate) {

+4 −2

Original line number	Diff line number	Diff line
		@@ -192,7 +192,8 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {

		assertThat(mTextView.getText()).isEqualTo(
		mContext.getResources().getString(R.string.dock_alignment_slow_charging));
		assertThat(mTextView.getCurrentTextColor()).isEqualTo(Color.WHITE);
		assertThat(mTextView.getCurrentTextColor()).isEqualTo(
		Utils.getColorError(mContext).getDefaultColor());
		}

		@Test
		@@ -209,7 +210,8 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {

		assertThat(mTextView.getText()).isEqualTo(
		mContext.getResources().getString(R.string.dock_alignment_not_charging));
		assertThat(mTextView.getCurrentTextColor()).isEqualTo(Color.WHITE);
		assertThat(mTextView.getCurrentTextColor()).isEqualTo(
		Utils.getColorError(mContext).getDefaultColor());
		}

		@Test