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

Commit a6fa8e54 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change the task layout to better match mocks, add "in" animation"

parents ab3225d7 e138bd19

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ 
                  android:screenOrientation="behind"

                  android:resizeableActivity="true"

                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"

                  android:theme="@style/RecentsTheme.Wallpaper">

                  android:theme="@style/RecentsTheme.Grid">

            <intent-filter>

                <action android:name="com.android.systemui.recents.TOGGLE_RECENTS" />

            </intent-filter>

packages/SystemUI/res/layout-sw600dp/recents_grid.xml

+4 −15
Original line number Diff line number Diff line
@@ -13,22 +13,11 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="24dp"

    android:paddingBottom="54dp"

    android:orientation="vertical"

    android:id="@+id/recents_container"

    android:id="@+id/recents_view"

    android:gravity="center"

    android:background="#99000000">

    <include layout="@layout/recents_stack_action_button" />

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:id="@+id/recents_view"

        android:layout_marginLeft="12dp"

        android:layout_marginTop="10dp"

        android:layout_marginRight="12dp"

        android:gravity="center">

</FrameLayout>
 
 No newline at end of file
 
</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/recents_stack_action_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -33,4 +33,5 @@ 
    android:fontFamily="sans-serif-medium"

    android:background="@drawable/recents_stack_action_background"

    android:visibility="invisible"

    android:forceHasOverlappingRendering="false" />
 
    android:forceHasOverlappingRendering="false"

    style="?attr/clearAllStyle" />

packages/SystemUI/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
    </declare-styleable>

    <declare-styleable name="RecentsPanelView">

        <attr name="recentItemLayout" format="reference" />

        <!-- Style for the "Clear all" button. -->

        <attr name="clearAllStyle" format="reference" />

    </declare-styleable>

    <declare-styleable name="DeadZone">

        <attr name="minSize" format="dimension" />

packages/SystemUI/res/values/dimens.xml

+15 −0
Original line number Diff line number Diff line
@@ -697,4 +697,19 @@ 


    <!-- The size of the PIP dismiss target. -->

    <dimen name="pip_dismiss_target_size">48dp</dimen>



    <!-- Values specific to grid-based recents. -->

    <!-- Margins around recent tasks. -->

    <dimen name="recents_grid_margin_left">15dp</dimen>

    <dimen name="recents_grid_margin_top">70dp</dimen>

    <dimen name="recents_grid_margin_right">15dp</dimen>

    <dimen name="recents_grid_margin_bottom">90dp</dimen>

    <!-- Margins around the "Clear all" button. -->

    <dimen name="recents_grid_clear_all_margin_left">0dp</dimen>

    <dimen name="recents_grid_clear_all_margin_top">30dp</dimen>

    <dimen name="recents_grid_clear_all_margin_right">15dp</dimen>

    <dimen name="recents_grid_clear_all_margin_bottom">0dp</dimen>

    <!-- Padding in between task views. -->

    <dimen name="recents_grid_inter_task_padding">15dp</dimen>



</resources>