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

Disable security view transitions in keyguard

Browse Source 
Now that we have a single stage unlock, there's no need for the transition. This
was causing unnecessary flickering to happen in views where we add the security view
just after inflation, which triggers the animation.

Fixes bug 7343632

Change-Id: I5bb8e37df66e4d96f00719e318424d46bf0e2e5a
This commit is contained in:
Jim Miller
2012-10-14 05:04:00 -07:00
parent 3b9f9bceea
commit 68c2489457
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
View File

@@ -162,7 +162,7 @@ public class KeyguardHostView extends KeyguardViewBase {
addDefaultWidgets();
updateSecurityViews();
setSystemUiVisibility(getSystemUiVisibility() | View.STATUS_BAR_DISABLE_BACK);
if (KeyguardUpdateMonitor.getInstance(mContext).getIsFirstBoot()) {
showPrimarySecurityScreen(false);
}
@@ -425,7 +425,7 @@ public class KeyguardHostView extends KeyguardViewBase {
}
showSecurityScreen(securityMode);
}
/**
* Shows the backup security screen for the current security mode. This could be used for
* password recovery screens but is currently only used for pattern unlock to show the
@@ -493,7 +493,7 @@ public class KeyguardHostView extends KeyguardViewBase {
// enabled because the user has left keyguard.
KeyguardUpdateMonitor.getInstance(mContext).setAlternateUnlockEnabled(true);
KeyguardUpdateMonitor.getInstance(mContext).setIsFirstBoot(false);
// If there's a pending runnable because the user interacted with a widget
// and we're leaving keyguard, then run it.
if (mLaunchRunnable != null) {
@@ -597,7 +597,7 @@ public class KeyguardHostView extends KeyguardViewBase {
View carrierText = selectorView.findViewById(R.id.keyguard_selector_fade_container);
selectorView.setCarrierArea(carrierText);
}
return view;
}
@@ -608,8 +608,8 @@ public class KeyguardHostView extends KeyguardViewBase {
* @param securityMode
*/
private void showSecurityScreen(SecurityMode securityMode) {
if (DEBUG) Log.d(TAG, "showSecurityScreen");
if (DEBUG) Log.d(TAG, "showSecurityScreen(" + securityMode + ")");
if (securityMode == mCurrentSecuritySelection) return;
KeyguardSecurityView oldView = getSecurityView(mCurrentSecuritySelection);
@@ -628,10 +628,12 @@ public class KeyguardHostView extends KeyguardViewBase {
final int childCount = mSecurityViewContainer.getChildCount();
// Do flip animation to the next screen
mSecurityViewContainer.setInAnimation(
AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_animate_in));
mSecurityViewContainer.setOutAnimation(
AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_animate_out));
if (false) {
mSecurityViewContainer.setInAnimation(
AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_animate_in));
mSecurityViewContainer.setOutAnimation(
AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_animate_out));
}
final int securityViewIdForMode = getSecurityViewIdForMode(securityMode);
for (int i = 0; i < childCount; i++) {
if (mSecurityViewContainer.getChildAt(i).getId() == securityViewIdForMode) {
@@ -640,11 +642,10 @@ public class KeyguardHostView extends KeyguardViewBase {
}
}
if (securityMode == SecurityMode.None) {
// Discard current runnable if we're switching back to the selector view
setOnDismissRunnable(null);
}
}
mCurrentSecuritySelection = securityMode;
}
@@ -809,7 +810,7 @@ public class KeyguardHostView extends KeyguardViewBase {
});
}
mKeyguardStatusViewManager = ((KeyguardStatusView)
mKeyguardStatusViewManager = ((KeyguardStatusView)
findViewById(R.id.keyguard_status_view_face_palm)).getManager();
}