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

am 39541bfa: am a0bc738f: Merge "Move coalescing to callback, optimize KeyguardStatusView." into klp-dev

Browse Source 
* commit '39541bfad07c4f13d61981c1e231144168b41aa8':
  Move coalescing to callback, optimize KeyguardStatusView.
This commit is contained in:
John Spurlock
2013-10-31 11:46:15 -07:00
committed by Android Git Automerger
parent 7595aa9420 39541bfad0
commit 9916eb6ecb
4 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Keyguard/src/com/android/keyguard/KeyguardService.java
View File

@@ -68,8 +68,6 @@ public class KeyguardService extends Service {
}
private final IKeyguardService.Stub mBinder = new IKeyguardService.Stub() {
private boolean mSetHiddenCalled;
private boolean mIsHidden;
public boolean isShowing() {
return mKeyguardViewMediator.isShowing();
}
@@ -91,10 +89,7 @@ public class KeyguardService extends Service {
}
public void setHidden(boolean isHidden) {
checkPermission();
if (mSetHiddenCalled && mIsHidden == isHidden) return;
mKeyguardViewMediator.setHidden(isHidden);
mSetHiddenCalled = true;
mIsHidden = isHidden;
}
public void dismiss() {
mKeyguardViewMediator.dismiss();

54
packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
View File

@@ -98,26 +98,13 @@ public class KeyguardStatusView extends GridLayout {
}
protected void refresh() {
Resources res = mContext.getResources();
Locale locale = Locale.getDefault();
final String dateFormat = DateFormat.getBestDateTimePattern(locale,
res.getString(R.string.abbrev_wday_month_day_no_year));
Patterns.update(mContext);
mDateView.setFormat24Hour(dateFormat);
mDateView.setFormat12Hour(dateFormat);
mDateView.setFormat24Hour(Patterns.dateView);
mDateView.setFormat12Hour(Patterns.dateView);
// 12-hour clock.
// CLDR insists on adding an AM/PM indicator even though it wasn't in the skeleton
// format. The following code removes the AM/PM indicator if we didn't want it.
final String clock12skel = res.getString(R.string.clock_12hr_format);
String clock12hr = DateFormat.getBestDateTimePattern(locale, clock12skel);
clock12hr = clock12skel.contains("a") ? clock12hr : clock12hr.replaceAll("a", "").trim();
mClockView.setFormat12Hour(clock12hr);
// 24-hour clock
final String clock24skel = res.getString(R.string.clock_24hr_format);
final String clock24hr = DateFormat.getBestDateTimePattern(locale, clock24skel);
mClockView.setFormat24Hour(clock24hr);
mClockView.setFormat12Hour(Patterns.clockView12);
mClockView.setFormat24Hour(Patterns.clockView24);
refreshAlarmStatus();
}
@@ -149,4 +136,35 @@ public class KeyguardStatusView extends GridLayout {
return LockPatternUtils.ID_DEFAULT_STATUS_WIDGET;
}
// DateFormat.getBestDateTimePattern is extremely expensive, and refresh is called often.
// This is an optimization to ensure we only recompute the patterns when the inputs change.
private static final class Patterns {
static String dateView;
static String clockView12;
static String clockView24;
static String cacheKey;
static void update(Context context) {
final Locale locale = Locale.getDefault();
final Resources res = context.getResources();
final String dateViewSkel = res.getString(R.string.abbrev_wday_month_day_no_year);
final String clockView12Skel = res.getString(R.string.clock_12hr_format);
final String clockView24Skel = res.getString(R.string.clock_24hr_format);
final String key = locale.toString() + dateViewSkel + clockView12Skel + clockView24Skel;
if (key.equals(cacheKey)) return;
dateView = DateFormat.getBestDateTimePattern(locale, dateViewSkel);
clockView12 = DateFormat.getBestDateTimePattern(locale, clockView12Skel);
// CLDR insists on adding an AM/PM indicator even though it wasn't in the skeleton
// format. The following code removes the AM/PM indicator if we didn't want it.
if (!clockView12Skel.contains("a")) {
clockView12 = clockView12.replaceAll("a", "").trim();
}
clockView24 = DateFormat.getBestDateTimePattern(locale, clockView24Skel);
cacheKey = key;
}
}
}

2
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -815,7 +815,7 @@ public class KeyguardUpdateMonitor {
for (int i = 0; i < mCallbacks.size(); i++) {
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
if (cb != null) {
cb.onKeyguardVisibilityChanged(isShowing);
cb.onKeyguardVisibilityChangedRaw(isShowing);
}
}
}

15
packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java
View File

@@ -19,6 +19,7 @@ import android.app.PendingIntent;
import android.app.admin.DevicePolicyManager;
import android.graphics.Bitmap;
import android.media.AudioManager;
import android.os.SystemClock;
import android.view.WindowManagerPolicy;
import com.android.internal.telephony.IccCardConstants;
@@ -27,6 +28,11 @@ import com.android.internal.telephony.IccCardConstants;
* Callback for general information relevant to lock screen.
*/
class KeyguardUpdateMonitorCallback {
private static final long VISIBILITY_CHANGED_COLLAPSE_MS = 1000;
private long mVisibilityChangedCalled;
private boolean mShowing;
/**
* Called when the battery status changes, e.g. when plugged in or unplugged, charge
* level, etc. changes.
@@ -70,6 +76,15 @@ class KeyguardUpdateMonitorCallback {
*/
void onKeyguardVisibilityChanged(boolean showing) { }
void onKeyguardVisibilityChangedRaw(boolean showing) {
final long now = SystemClock.elapsedRealtime();
if (showing == mShowing
&& (now - mVisibilityChangedCalled) < VISIBILITY_CHANGED_COLLAPSE_MS) return;
onKeyguardVisibilityChanged(showing);
mVisibilityChangedCalled = now;
mShowing = showing;
}
/**
* Called when visibility of lockscreen clock changes, such as when
* obscured by a widget.