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

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

Merge "Introducing Clear-all button on Overview" into ub-launcher3-edmonton

parents e973b032 6d2321cb

quickstep/res/layout/fallback_recents_activity.xml

+17 −7
Original line number Diff line number Diff line
@@ -20,13 +20,23 @@ 
    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"

    >

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



        <com.android.quickstep.fallback.FallbackRecentsView

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

        android:id="@+id/overview_panel"

            android:id="@id/overview_panel"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:clipChildren="false"

            android:clipToPadding="false"

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

            android:focusableInTouchMode="true"

            android:theme="@style/HomeScreenElementTheme"

        >



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

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

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

quickstep/res/layout/overview_clear_all_button.xml

0 → 100644
+14 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<TextView

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

    android:id="@+id/clear_all_button"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="end|top"

    android:fontFamily="sans-serif-medium"

    android:text="@string/recents_clear_all"

    android:textColor="?attr/workspaceTextColor"

    android:background="?android:attr/selectableItemBackground"

    android:textSize="14sp"

/>
 
 No newline at end of file

quickstep/res/layout/overview_panel.xml

+15 −6
Original line number Diff line number Diff line
@@ -14,14 +14,23 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.quickstep.views.LauncherRecentsView

<com.android.quickstep.views.RecentsViewContainer

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

    android:theme="@style/HomeScreenElementTheme"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:visibility="invisible"

>

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



    <com.android.quickstep.views.LauncherRecentsView

        android:id="@id/overview_panel"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipChildren="false"

        android:clipToPadding="false"

    android:visibility="invisible"

    android:focusableInTouchMode="true" >

        android:focusableInTouchMode="true"

        android:theme="@style/HomeScreenElementTheme"

    >



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

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

quickstep/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -45,4 +45,7 @@ 
    <!-- Copied from framework resource:

       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>

</resources>

quickstep/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -35,4 +35,7 @@ 


    <!-- Content description for the recent apps's accessibility option that closes it. [CHAR LIMIT=NONE] -->

    <string name="accessibility_close_task">Close</string>



    <!-- Recents: Title of a button that clears the task list, i.e. closes all tasks. [CHAR LIMIT=30] -->

    <string name="recents_clear_all">Clear all</string>

</resources>
 
 No newline at end of file