summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2018-04-26 17:45:14 -0700
committer Lucas Dupin <dupin@google.com> 2018-04-28 03:56:13 +0000
commit08c013e2f05f9de6b4457b30c716595424b1bd8c (patch)
treedda243ebe5950dabf2100be8497c69492735b992
parent3d7ccaf8b5e81378770cb3e18ff66d19418b8135 (diff)
Update clock format when locale list changes
Isolated clock refresh logic into refreshTime() and refreshFormat(). refreshFormat() makes 2 binder calls and should only called when necessary: switching users, updating locale list or initialization. Test: manual Change-Id: Ia8a3a7655479d44b02c636c3c84ce8cc84e6f210 Fixes: 78535670
-rw-r--r--packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java18
1 files changed, 12 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
index ce34d0b3b7cc..727b62b4b79d 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
@@ -82,14 +82,14 @@ public class KeyguardStatusView extends GridLayout implements
@Override
public void onTimeChanged() {
- refresh();
+ refreshTime();
}
@Override
public void onKeyguardVisibilityChanged(boolean showing) {
if (showing) {
if (DEBUG) Slog.v(TAG, "refresh statusview showing:" + showing);
- refresh();
+ refreshTime();
updateOwnerInfo();
updateLogoutView();
}
@@ -107,7 +107,7 @@ public class KeyguardStatusView extends GridLayout implements
@Override
public void onUserSwitchComplete(int userId) {
- refresh();
+ refreshFormat();
updateOwnerInfo();
updateLogoutView();
}
@@ -184,7 +184,7 @@ public class KeyguardStatusView extends GridLayout implements
boolean shouldMarquee = KeyguardUpdateMonitor.getInstance(mContext).isDeviceInteractive();
setEnableMarquee(shouldMarquee);
- refresh();
+ refreshFormat();
updateOwnerInfo();
updateLogoutView();
updateDark();
@@ -289,9 +289,10 @@ public class KeyguardStatusView extends GridLayout implements
mClockView.refresh();
}
- private void refresh() {
+ private void refreshFormat() {
Patterns.update(mContext);
- refreshTime();
+ mClockView.setFormat12Hour(Patterns.clockView12);
+ mClockView.setFormat24Hour(Patterns.clockView24);
}
public int getLogoutButtonHeight() {
@@ -338,6 +339,11 @@ public class KeyguardStatusView extends GridLayout implements
}
@Override
+ public void onLocaleListChanged() {
+ refreshFormat();
+ }
+
+ @Override
public boolean hasOverlappingRendering() {
return false;
}