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

Commit 8f65d492 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias Committed by Automerger Merge Worker
Browse files

Merge "Update keyboard quick switch view ordering and add icons" into udc-dev am: 4ee471fe 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23035131



Change-Id: I9bfeafca073558cd0f47c7cec6e9984aef0b997c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 51eb685c 4ee471fe

quickstep/res/layout-land/keyboard_quick_switch_taskview.xml

+23 −0
Original line number Diff line number Diff line
@@ -59,6 +59,29 @@ 
            app:layout_constraintStart_toEndOf="@id/thumbnail1"

            app:layout_constraintEnd_toEndOf="parent"/>



        <ImageView

            android:id="@+id/icon1"

            android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_marginTop="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:layout_marginStart="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:importantForAccessibility="no"



            app:layout_constraintTop_toTopOf="@id/thumbnail1"

            app:layout_constraintStart_toStartOf="@id/thumbnail1"/>



        <ImageView

            android:id="@+id/icon2"

            android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_marginTop="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:layout_marginStart="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:importantForAccessibility="no"

            android:visibility="gone"



            app:layout_constraintTop_toTopOf="@id/thumbnail2"

            app:layout_constraintStart_toStartOf="@id/thumbnail2"/>



    </androidx.constraintlayout.widget.ConstraintLayout>



</com.android.launcher3.taskbar.KeyboardQuickSwitchTaskView>

quickstep/res/layout/keyboard_quick_switch_taskview.xml

+23 −0
Original line number Diff line number Diff line
@@ -59,6 +59,29 @@ 
            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"/>



        <ImageView

            android:id="@+id/icon1"

            android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_marginTop="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:layout_marginStart="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:importantForAccessibility="no"



            app:layout_constraintTop_toTopOf="@id/thumbnail1"

            app:layout_constraintStart_toStartOf="@id/thumbnail1"/>



        <ImageView

            android:id="@+id/icon2"

            android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_marginTop="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:layout_marginStart="@dimen/keyboard_quick_switch_taskview_icon_margin"

            android:importantForAccessibility="no"

            android:visibility="gone"



            app:layout_constraintTop_toTopOf="@id/thumbnail2"

            app:layout_constraintStart_toStartOf="@id/thumbnail2"/>



    </androidx.constraintlayout.widget.ConstraintLayout>



</com.android.launcher3.taskbar.KeyboardQuickSwitchTaskView>

quickstep/res/layout/keyboard_quick_switch_thumbnail.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,4 +19,5 @@ 
    android:layout_height="match_parent"

    android:scaleType="centerCrop"

    android:background="@drawable/keyboard_quick_switch_task_view_background"

    android:clipToOutline="true"/>
 
    android:clipToOutline="true"

    android:importantForAccessibility="no"/>

quickstep/res/values/dimens.xml

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

    <dimen name="keyboard_quick_switch_taskview_width">104dp</dimen>

    <dimen name="keyboard_quick_switch_taskview_height">134dp</dimen>

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

    <dimen name="keyboard_quick_switch_taskview_icon_margin">4dp</dimen>

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

    <dimen name="keyboard_quick_switch_margin_top">56dp</dimen>

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

quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public final class KeyboardQuickSwitchController implements 
            mModel.getThumbnailCache().updateThumbnailInBackground(task, callback);

        }



        void updateTitleInBackground(Task task, Consumer<Task> callback) {

        void updateIconInBackground(Task task, Consumer<Task> callback) {

            mModel.getIconCache().updateIconInBackground(task, callback);

        }