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

Commit c82c6396 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Moving clear all button inside the recents view 

Bug: 72222505
Bug: 109828536

Change-Id: I843b79db3e47abc2c41ed78f186b9c941941ddef
parent 367a53ec

quickstep/res/layout/fallback_recents_activity.xml

+5 −18
Original line number Diff line number Diff line
@@ -20,14 +20,6 @@ 
    android:layout_height="match_parent"

    android:fitsSystemWindows="true">



    <com.android.quickstep.views.RecentsViewContainer

        android:id="@+id/overview_panel_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipChildren="false"

    >

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



    <com.android.quickstep.fallback.FallbackRecentsView

        android:id="@id/overview_panel"

        android:layout_width="match_parent"
@@ -35,10 +27,5 @@ 
        android:clipChildren="false"

        android:clipToPadding="false"

        android:outlineProvider="none"

            android:focusableInTouchMode="true"

            android:theme="@style/HomeScreenElementTheme"

        >



        </com.android.quickstep.fallback.FallbackRecentsView>

    </com.android.quickstep.views.RecentsViewContainer>

        android:theme="@style/HomeScreenElementTheme" />

</com.android.quickstep.fallback.RecentsRootView>

quickstep/res/layout/overview_clear_all_button.xml

+16 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.quickstep.views.ClearAllButton

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

    android:id="@+id/clear_all_button"

    style="@android:style/Widget.DeviceDefault.Button.Borderless"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="start|top"

    android:text="@string/recents_clear_all"

    android:textColor="?attr/workspaceTextColor"

    android:visibility="invisible"

    android:textSize="14sp"

    android:importantForAccessibility="no"

    android:translationY="@dimen/task_thumbnail_half_top_margin"

    />
 
 No newline at end of file

quickstep/res/layout/overview_panel.xml

+5 −19
Original line number Diff line number Diff line
@@ -14,26 +14,12 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.quickstep.views.RecentsViewContainer

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:visibility="invisible"

>

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



<com.android.quickstep.views.LauncherRecentsView

        android:id="@id/overview_panel"

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

    android:theme="@style/HomeScreenElementTheme"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:clipToPadding="false"

        android:outlineProvider="none"

        android:focusableInTouchMode="true"

    android:accessibilityPaneTitle="@string/accessibility_recent_apps"

        android:theme="@style/HomeScreenElementTheme"

    >



    </com.android.quickstep.views.LauncherRecentsView>

</com.android.quickstep.views.RecentsViewContainer>
 
 No newline at end of file
 
    android:visibility="invisible" />
 
 No newline at end of file

quickstep/res/layout/task.xml

+5 −4
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:focusable="false"

    android:elevation="4dp">

    android:defaultFocusHighlightEnabled="false"

    android:elevation="4dp"

    android:focusable="true">



    <com.android.quickstep.views.TaskThumbnailView

        android:id="@+id/snapshot"
@@ -30,7 +31,7 @@ 
        android:id="@+id/icon"

        android:layout_width="@dimen/task_thumbnail_icon_size"

        android:layout_height="@dimen/task_thumbnail_icon_size"

        android:importantForAccessibility="no"

        android:layout_gravity="top|center_horizontal"

        android:focusable="false"

        android:layout_gravity="top|center_horizontal" />

        android:importantForAccessibility="no" />

</com.android.quickstep.views.TaskView>
 
 No newline at end of file

quickstep/res/values/dimens.xml

+1 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<resources>



    <dimen name="task_thumbnail_top_margin">24dp</dimen>

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

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

    <dimen name="task_corner_radius">2dp</dimen>

    <dimen name="recents_page_spacing">10dp</dimen>
@@ -50,9 +51,6 @@ 
       docked_stack_divider_thickness - 2 * docked_stack_divider_insets -->

    <dimen name="multi_window_task_divider_size">10dp</dimen>



    <!-- Width of the space behind the last task in Overview. In the center of it, there is "Clear all" button. -->

    <dimen name="clear_all_container_width">168dp</dimen>



    <dimen name="shelf_surface_radius">16dp</dimen>

    <!-- same as vertical_drag_handle_size -->

    <dimen name="shelf_surface_offset">24dp</dimen>