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

Merge "Update clock format when locale list changes" into pi-dev

Browse Source
This commit is contained in:
android-build-team Robot
2018-04-30 18:12:16 +00:00
committed by Android (Google) Code Review
parent 6c2679d55d 08c013e2f0
commit 74f5aa0237
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
View File

@@ -82,14 +82,14 @@ public class KeyguardStatusView extends GridLayout implements
@Override @Override
public void onTimeChanged() { public void onTimeChanged() {
refresh(); refreshTime();
} }
@Override @Override
public void onKeyguardVisibilityChanged(boolean showing) { public void onKeyguardVisibilityChanged(boolean showing) {
if (showing) { if (showing) {
if (DEBUG) Slog.v(TAG, "refresh statusview showing:" + showing); if (DEBUG) Slog.v(TAG, "refresh statusview showing:" + showing);
refresh(); refreshTime();
updateOwnerInfo(); updateOwnerInfo();
updateLogoutView(); updateLogoutView();
} }
@@ -107,7 +107,7 @@ public class KeyguardStatusView extends GridLayout implements
@Override @Override
public void onUserSwitchComplete(int userId) { public void onUserSwitchComplete(int userId) {
refresh(); refreshFormat();
updateOwnerInfo(); updateOwnerInfo();
updateLogoutView(); updateLogoutView();
} }
@@ -184,7 +184,7 @@ public class KeyguardStatusView extends GridLayout implements
boolean shouldMarquee = KeyguardUpdateMonitor.getInstance(mContext).isDeviceInteractive(); boolean shouldMarquee = KeyguardUpdateMonitor.getInstance(mContext).isDeviceInteractive();
setEnableMarquee(shouldMarquee); setEnableMarquee(shouldMarquee);
refresh(); refreshFormat();
updateOwnerInfo(); updateOwnerInfo();
updateLogoutView(); updateLogoutView();
updateDark(); updateDark();
@@ -289,9 +289,10 @@ public class KeyguardStatusView extends GridLayout implements
mClockView.refresh(); mClockView.refresh();
} }
private void refresh() { private void refreshFormat() {
Patterns.update(mContext); Patterns.update(mContext);
refreshTime(); mClockView.setFormat12Hour(Patterns.clockView12);
mClockView.setFormat24Hour(Patterns.clockView24);
} }
public int getLogoutButtonHeight() { public int getLogoutButtonHeight() {
@@ -337,6 +338,11 @@ public class KeyguardStatusView extends GridLayout implements
Dependency.get(ConfigurationController.class).removeCallback(this); Dependency.get(ConfigurationController.class).removeCallback(this);
} }
@Override
public void onLocaleListChanged() {
refreshFormat();
}
@Override @Override
public boolean hasOverlappingRendering() { public boolean hasOverlappingRendering() {
return false; return false;