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

Commit f5def622 authored by Manu Cornet's avatar Manu Cornet Committed by Android (Google) Code Review
Browse files

Merge "Revert "Grid recents: tweak task header layout to better match mocks""

parents 235117ac c7338034

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.Grid">

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

            <intent-filter>

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

            </intent-filter>

packages/SystemUI/res/layout/recents_task_view_header.xml

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ 
        android:paddingTop="8dp"

        android:paddingBottom="8dp"

        android:paddingStart="16dp"

        android:paddingEnd="12dp"

        style="?attr/taskIconStyle" />

        android:paddingEnd="12dp" />

    <TextView

        android:id="@+id/title"

        android:layout_width="match_parent"

packages/SystemUI/res/values-sw600dp/dimens.xml

+0 −24
Original line number Diff line number Diff line
@@ -99,28 +99,4 @@ 


    <!-- The offsets the tasks animate from when recents is launched while docking -->

    <dimen name="recents_task_stack_animation_launched_while_docking_offset">192dp</dimen>



    <!--                                        -->

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

    <!--                                        -->



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

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

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

    <dimen name="recents_grid_margin_right">32dp</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">36dp</dimen>

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

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

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

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

    <!-- The height of each task view's header. -->

    <dimen name="recents_grid_task_header_height">44dp</dimen>

    <!-- The margin to separate the title from the edge of the header. -->

    <dimen name="recents_grid_task_title_margin_start">12dp</dimen>

    <!-- The padding for the dismiss button. -->

    <dimen name="recents_grid_task_dismiss_button_padding">8dp</dimen>



</resources>

packages/SystemUI/res/values/attrs.xml

+2 −3
Original line number Diff line number Diff line
@@ -28,11 +28,10 @@ 
    <declare-styleable name="NotificationLinearLayout">

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

    </declare-styleable>

    <declare-styleable name="RecentsTheme">

    <declare-styleable name="RecentsPanelView">

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

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

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

        <!-- Style for task icons in Recents. -->

        <attr name="taskIconStyle" 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
@@ -716,4 +716,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>