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

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

Merge "Enabling hardware layers while overscrolling widget pager" into jb-mr1-dev

parents e01538f2 5b50a25e

core/res/res/layout/keyguard_transport_control_view.xml

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="center_horizontal"

    android:layerType="hardware"

    android:id="@+id/keyguard_transport_control">



    <!-- FrameLayout used as scrim to show between album art and buttons -->

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

+3 −1
Original line number Diff line number Diff line
@@ -97,12 +97,14 @@ public class KeyguardSubdivisionLayout extends ViewGroup { 
            leafs.clear();

            getLeafs(leafs, 1);



            // We find the first leaf who's depth is not

            // If the tree is complete, then we start a new level at the rightmost side.

            double r = log2(leafs.size());

            if (Math.ceil(r) == Math.floor(r)) {

                return leafs.get(leafs.size() - 1);

            }



            // Tree is not complete, find the first leaf who's depth is less than the depth of

            // the tree.

            int treeDepth = depth();

            for (int i = leafs.size() - 1; i >= 0; i--) {

                BiTree n = leafs.get(i);

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

+7 −0
Original line number Diff line number Diff line
@@ -91,7 +91,14 @@ public class KeyguardWidgetFrame extends FrameLayout { 


            mForegroundAlpha = (int) Math.round((r * 255));

            mForegroundDrawable.setAlpha(mForegroundAlpha);

            if (getLayerType() != LAYER_TYPE_HARDWARE) {

                setLayerType(LAYER_TYPE_HARDWARE, null);

            }

            invalidate();

        } else {

            if (getLayerType() != LAYER_TYPE_NONE) {

                setLayerType(LAYER_TYPE_NONE, null);

            }

        }

    }

}