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

Merge "Update theme after registering config listener" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-20 03:41:52 +00:00
committed by Android (Google) Code Review
parent 1bdcb36b94 12dab90cc9
commit e44e4c635e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/keyguard/KeyguardMessageArea.java
View File

@@ -87,15 +87,14 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp
monitor.registerCallback(mInfoCallback); monitor.registerCallback(mInfoCallback);
mHandler = new Handler(Looper.myLooper()); mHandler = new Handler(Looper.myLooper());
mConfigurationController = configurationController; mConfigurationController = configurationController;
onThemeChanged(); onThemeChanged();
update();
} }
@Override @Override
protected void onAttachedToWindow() { protected void onAttachedToWindow() {
super.onAttachedToWindow(); super.onAttachedToWindow();
mConfigurationController.addCallback(this); mConfigurationController.addCallback(this);
onThemeChanged();
} }
@Override @Override
@@ -116,8 +115,8 @@ public class KeyguardMessageArea extends TextView implements SecurityMessageDisp
}); });
ColorStateList newTextColors = ColorStateList.valueOf(array.getColor(0, Color.RED)); ColorStateList newTextColors = ColorStateList.valueOf(array.getColor(0, Color.RED));
array.recycle(); array.recycle();
setTextColor(newTextColors);
mDefaultColorState = newTextColors; mDefaultColorState = newTextColors;
update();
} }
@Override @Override

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
View File

@@ -123,7 +123,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
mAccessibilityController = accessibilityController; mAccessibilityController = accessibilityController;
mConfigurationController = configurationController; mConfigurationController = configurationController;
mStatusBarStateController = statusBarStateController; mStatusBarStateController = statusBarStateController;
onThemeChanged();
} }
@Override @Override
@@ -133,6 +132,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
mConfigurationController.addCallback(this); mConfigurationController.addCallback(this);
mKeyguardUpdateMonitor.registerCallback(mUpdateMonitorCallback); mKeyguardUpdateMonitor.registerCallback(mUpdateMonitorCallback);
mUnlockMethodCache.addListener(this); mUnlockMethodCache.addListener(this);
onThemeChanged();
} }
@Override @Override