Merge "Addressing a couple comments on previous CL" into jb-mr1-lockscreen-dev

Author: Adam Cohen

policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java

@@ -62,7 +62,7 @@ public class KeyguardWidgetFrame extends FrameLayout {
     private float mBackgroundAlphaMultiplier = 1.0f;
     private Drawable mBackgroundDrawable;
     private Rect mBackgroundRect = new Rect();
-    private static int mSmallWidgetHeight;
+    private int mSmallWidgetHeight;
 
     // Multiple callers may try and adjust the alpha of the frame. When a caller shows
     // the outlines, we give that caller control, and nobody else can fade them out.

policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java

@@ -702,11 +702,13 @@ protected void onMeasure(int widthSpec, int heightSpec) {
             } else if (lp.childType == LayoutParams.CHILD_TYPE_SCRIM) {
                 setScrimView(child);
             }
+
             if (child.getVisibility() == GONE) continue;
         }
 
-        // We want to measure the challenge view first, for various reasons that I'd rather
-        // not get into here.
+        // We want to measure the challenge view first, since the KeyguardWidgetPager
+        // needs to do things its measure pass that are dependent on the challenge view
+        // having been measured.
         if (mChallengeView != null) {
             measureChildWithMargins(mChallengeView, widthSpec, 0, heightSpec, 0);
         }