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

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

Merge "Add a no recent tasks message to the keyboard quick switch view" into udc-dev

parents deec0f62 b29355c1

quickstep/res/layout/keyboard_quick_switch_overview.xml

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
            android:layout_height="@dimen/keyboard_quick_switch_recents_icon_size"

            android:layout_marginBottom="8dp"

            android:src="@drawable/ic_empty_recents"

            android:tint="?androidprv:attr/materialColorOnSurface"



            app:tint="?androidprv:attr/materialColorOnSurface"

            app:layout_constraintVertical_chainStyle="packed"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintBottom_toTopOf="@id/text"
@@ -50,7 +50,7 @@ 
            app:layout_constraintEnd_toEndOf="parent"/>



        <TextView

            style="@style/KeyboardQuickSwitchOverview"

            style="@style/KeyboardQuickSwitchText"

            android:id="@+id/text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

quickstep/res/layout/keyboard_quick_switch_view.xml

+39 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->

<com.android.launcher3.taskbar.KeyboardQuickSwitchView

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

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -27,6 +28,43 @@ 
    android:focusableInTouchMode="true"

    app:layout_ignoreInsets="true">



    <androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/no_recent_items_pane"

        android:layout_width="match_parent"

        android:layout_height="@dimen/keyboard_quick_switch_taskview_height"

        android:paddingVertical="@dimen/keyboard_quick_switch_view_spacing"

        android:alpha="0"

        android:visibility="gone">



        <ImageView

            android:id="@+id/no_recent_items_icon"

            android:layout_width="@dimen/keyboard_quick_switch_no_recent_items_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_no_recent_items_icon_size"

            android:layout_marginBottom="@dimen/keyboard_quick_switch_no_recent_items_icon_margin"

            android:src="@drawable/ic_empty_recents"

            android:tint="?androidprv:attr/materialColorOnSurfaceInverse"

            android:importantForAccessibility="no"



            app:layout_constraintVertical_chainStyle="packed"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintBottom_toTopOf="@id/no_recent_items_text"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"/>



        <TextView

            style="@style/KeyboardQuickSwitchText.OnBackground"

            android:id="@+id/no_recent_items_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/recents_empty_message"



            app:layout_constraintTop_toBottomOf="@id/no_recent_items_icon"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"/>



    </androidx.constraintlayout.widget.ConstraintLayout>



    <HorizontalScrollView

        android:id="@+id/scroll_view"

        android:layout_width="wrap_content"
@@ -34,7 +72,7 @@ 
        android:fillViewport="true"

        android:scrollbars="none"

        android:alpha="0"

        android:visibility="invisible"

        android:visibility="gone"



        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

quickstep/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -381,4 +381,6 @@ 
    <dimen name="keyboard_quick_switch_split_view_spacing">2dp</dimen>

    <dimen name="keyboard_quick_switch_view_radius">28dp</dimen>

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

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

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

</resources>

quickstep/res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ 
            =1{Show # more app.}

            other{Show # more apps.}

        }</string>



    <!-- Accessibility label for quick switch tiles showing split tasks [CHAR LIMIT=NONE] -->

    <string name="quick_switch_split_task"><xliff:g id="app_name_1" example="Chrome">%1$s</xliff:g> and <xliff:g id="app_name_2" example="Gmail">%2$s</xliff:g></string>

</resources>

quickstep/res/values/styles.xml

+5 −1
Original line number Diff line number Diff line
@@ -215,13 +215,17 @@ 
        <item name="android:textSize">14sp</item>

    </style>



    <style name="KeyboardQuickSwitchOverview">

    <style name="KeyboardQuickSwitchText">

        <item name="fontFamily">google-sans-text</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>

        <item name="lineHeight">20sp</item>

    </style>



    <style name="KeyboardQuickSwitchText.OnBackground" parent="KeyboardQuickSwitchText">

        <item name="android:textColor">?androidprv:attr/materialColorOnSurfaceInverse</item>

    </style>



    <style name="GestureTutorialActivity"

        parent="@style/AppTheme">

        <item name="background">@android:color/transparent</item>