Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4050da7d authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

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

parents 70aa528b 5be14ded

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+4 −2
Original line number Diff line number Diff line
@@ -702,11 +702,13 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
            } 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);

        }