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

Check for header when restoring default clock.

Browse Source 
This change tracks the state of the header in the smart space while a
custom clock is showing so that the correct digital clock size can be
restored when switching back to the default clock face.

Fixes: 135534500
Test: visual - take phone of dock and check size of default clock
Change-Id: Id4d1d46c94d8480f9675a3cf682a20a9706ba707
This commit is contained in:
Robert Snoeberger
2019-06-20 10:40:13 -04:00
parent e288f13f25
commit f65513aff5
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
View File

@@ -222,8 +222,13 @@ public class KeyguardClockSwitch extends RelativeLayout {
mClockPlugin = null;
}
if (plugin == null) {
mClockView.setVisibility(View.VISIBLE);
mClockViewBold.setVisibility(View.INVISIBLE);
if (mShowingHeader) {
mClockView.setVisibility(View.GONE);
mClockViewBold.setVisibility(View.VISIBLE);
} else {
mClockView.setVisibility(View.VISIBLE);
mClockViewBold.setVisibility(View.INVISIBLE);
}
mKeyguardStatusArea.setVisibility(View.VISIBLE);
return;
}
@@ -401,10 +406,13 @@ public class KeyguardClockSwitch extends RelativeLayout {
* these cases.
*/
void setKeyguardShowingHeader(boolean hasHeader) {
if (mShowingHeader == hasHeader || hasCustomClock()) {
if (mShowingHeader == hasHeader) {
return;
}
mShowingHeader = hasHeader;
if (hasCustomClock()) {
return;
}
float smallFontSize = mContext.getResources().getDimensionPixelSize(
R.dimen.widget_small_font_size);