From 47c6cfaa3799951f999a4d2000cb628080708551 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Sat, 27 Oct 2012 18:29:52 -0700
Subject: [PATCH] Ensuring layers are enabled on screen on and that pages are
 correctly transformed

Change-Id: Ifeeb9baeb3cde58d034d9988565bc2ce07c3c23a
---
 .../policy/impl/keyguard/KeyguardViewStateManager.java |  9 +++++++--
 .../policy/impl/keyguard/KeyguardWidgetPager.java      | 10 ++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java
index c163b975fbc93..806c6f096fee4 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java
@@ -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
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
index 772c7632557ec..922ceee551137 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
@@ -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) {