Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I5fe8d27b7e94165ab916f12545712e019cadfabb
This commit is contained in:
TreeHugger Robot
2020-04-17 01:57:31 +00:00
committed by Automerger Merge Worker
parent cb9e128ee6 ef84b9a1c5
commit 1026bf5c76
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -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) {

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

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