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

Ensuring layers are enabled on screen on and that pages are correctly transformed

Browse Source 
Change-Id: Ifeeb9baeb3cde58d034d9988565bc2ce07c3c23a
This commit is contained in:
Adam Cohen
2012-10-27 18:29:52 -07:00
parent effc03a952
commit 47c6cfaa37
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java
View File

@@ -17,7 +17,6 @@ package com.android.internal.policy.impl.keyguard;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import android.view.View;
public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChallengeScrolledListener {
@@ -29,6 +28,7 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle
private KeyguardSecurityView mKeyguardSecurityContainer;
private int[] mTmpPoint = new int[2];
private static final int SCREEN_ON_HINT_DURATION = 1000;
private static final int SCREEN_ON_RING_HINT_DELAY = 300;
Handler mMainQueue = new Handler(Looper.myLooper());
int mChallengeTop = 0;
@@ -147,7 +147,12 @@ public class KeyguardViewStateManager implements SlidingChallengeLayout.OnChalle
}
public void showUsabilityHints() {
mKeyguardSecurityContainer.showUsabilityHint();
mMainQueue.postDelayed( new Runnable() {
@Override
public void run() {
mKeyguardSecurityContainer.showUsabilityHint();
}
} , SCREEN_ON_RING_HINT_DELAY);
mPagedView.showInitialPageHints();
mHideHintsRunnable = new Runnable() {
@Override

10
policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
View File

@@ -255,7 +255,6 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
@Override
protected void onPageBeginMoving() {
enablePageLayers();
if (mViewStateManager != null) {
mViewStateManager.onPageBeginMoving();
}
@@ -416,6 +415,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
}
void showOutlinesAndSidePages() {
enablePageLayers();
animateOutlinesAndSidePages(true);
}
@@ -424,13 +424,7 @@ public class KeyguardWidgetPager extends PagedView implements PagedView.PageSwit
}
public void showInitialPageHints() {
// We start with everything showing
setChildrenOutlineAlpha(1.0f);
setSidePagesAlpha(1.0f);
int currPage = getCurrentPage();
KeyguardWidgetFrame frame = getWidgetPageAt(currPage);
frame.setBackgroundAlpha(0f);
showOutlinesAndSidePages();
}
void animateOutlinesAndSidePages(final boolean show) {