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

Commit fd81f910 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Prevent Recents from doing a relayout" into jb-mr2-dev

parents b936b774 31a6fb3b

packages/SystemUI/res/layout-land/status_bar_recent_panel.xml

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ 
            android:fadingEdge="horizontal"

            android:scrollbars="none"

            android:layout_gravity="right"

            android:fadingEdgeLength="@dimen/status_bar_recents_scroll_fading_edge_length">

            android:fadingEdgeLength="@dimen/status_bar_recents_scroll_fading_edge_length"

            android:fitsSystemWindows="true">



            <LinearLayout android:id="@+id/recents_linear_layout"

                android:layout_width="wrap_content"

packages/SystemUI/res/layout/status_bar_recent_panel.xml

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ 
            android:fadingEdgeLength="@dimen/status_bar_recents_scroll_fading_edge_length"

            android:layout_gravity="bottom|start"

            android:clipToPadding="false"

            android:clipChildren="false">

            android:clipChildren="false"

            android:fitsSystemWindows="true">



            <LinearLayout android:id="@+id/recents_linear_layout"

                android:layout_width="match_parent"

packages/SystemUI/res/layout/system_bar_recent_panel.xml

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ 
            android:fadingEdgeLength="20dip"

            android:layout_gravity="bottom|start"

            android:clipToPadding="false"

            android:clipChildren="false">

            android:clipChildren="false"

            android:fitsSystemWindows="true">



            <LinearLayout android:id="@+id/recents_linear_layout"

                android:layout_width="wrap_content"

packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ public class RecentsActivity extends Activity { 
        setContentView(R.layout.status_bar_recent_panel);

        mRecentsPanel = (RecentsPanelView) findViewById(R.id.recents_root);

        mRecentsPanel.setOnTouchListener(new TouchOutsideListener(mRecentsPanel));

        mRecentsPanel.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);



        final RecentTasksLoader recentTasksLoader = RecentTasksLoader.getInstance(this);

        recentTasksLoader.setRecentsPanel(mRecentsPanel, mRecentsPanel);

packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ public class RecentsHorizontalScrollView extends HorizontalScrollView 
            mPerformanceHelper.drawCallback(canvas,

                    left, right, top, bottom, mScrollX, mScrollY,

                    0, 0,

                    getLeftFadingEdgeStrength(), getRightFadingEdgeStrength());

                    getLeftFadingEdgeStrength(), getRightFadingEdgeStrength(), mPaddingTop);

        }

    }