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

Commit 21175167 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias Committed by Android (Google) Code Review
Browse files

Merge changes I3e97ec83,Ib47a8a7f into main 

* changes:
  Update KQS UX to better support square aspect ratio devices
  Update KQS recents apps and desktop mode launching UX
parents 8da23e8c f0a6d1df

quickstep/res/drawable/keyboard_quick_switch_overview_button_background.xml→quickstep/res/drawable/keyboard_quick_switch_text_button_background.xml

+2 −3
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 
-->

<shape

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

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

    android:shape="rectangle">

    <solid android:color="?attr/materialColorSurfaceBright" />

    <corners android:radius="@dimen/keyboard_quick_switch_task_view_radius" />

    <solid android:color="@android:color/white" />

    <corners android:radius="@dimen/keyboard_quick_switch_text_button_radius" />

</shape>

quickstep/res/layout-land/keyboard_quick_switch_taskview.xml

+5 −5
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

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

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

    android:layout_width="@dimen/keyboard_quick_switch_taskview_width"

    android:layout_height="@dimen/keyboard_quick_switch_taskview_height"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:importantForAccessibility="yes"

    android:background="@drawable/keyboard_quick_switch_task_view_background"

    android:clipToOutline="true"
@@ -27,8 +27,8 @@ 


    <androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_width="@dimen/keyboard_quick_switch_taskview_width"

        android:layout_height="@dimen/keyboard_quick_switch_taskview_height"



        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"
@@ -52,7 +52,7 @@ 
            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:visibility="gone"

            android:layout_marginStart="@dimen/keyboard_quick_switch_split_view_spacing"

            android:layout_marginStart="@dimen/keyboard_quick_switch_view_small_spacing"



            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintBottom_toBottomOf="parent"

quickstep/res/layout-land/keyboard_quick_switch_taskview_square.xml

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

<!-- Copyright (C) 2024 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.launcher3.taskbar.KeyboardQuickSwitchTaskView

    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"

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:importantForAccessibility="yes"

    android:background="@drawable/keyboard_quick_switch_task_view_background"

    android:clipToOutline="true"

    launcher:focusBorderColor="?androidprv:attr/materialColorOutline">



    <androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/content"

        android:layout_width="0dp"

        android:layout_height="@dimen/keyboard_quick_switch_taskview_height"



        app:layout_constraintDimensionRatio="1:1"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent">



        <include

            layout="@layout/keyboard_quick_switch_taskview_thumbnail"

            android:id="@+id/thumbnail_1"

            android:layout_width="match_parent"

            android:layout_height="0dp"



            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintBottom_toTopOf="@id/thumbnail_2"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"/>



        <include

            layout="@layout/keyboard_quick_switch_taskview_thumbnail"

            android:id="@+id/thumbnail_2"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:visibility="gone"

            android:layout_marginTop="@dimen/keyboard_quick_switch_view_small_spacing"



            app:layout_constraintTop_toBottomOf="@id/thumbnail_1"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"/>



        <ImageView

            android:id="@+id/icon_1"

            android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:importantForAccessibility="no"

            android:scaleType="centerCrop"



            app:layout_constraintTop_toTopOf="@id/thumbnail_1"

            app:layout_constraintBottom_toBottomOf="@id/thumbnail_1"

            app:layout_constraintStart_toStartOf="@id/thumbnail_1"

            app:layout_constraintEnd_toEndOf="@id/thumbnail_1"/>



        <ImageView

            android:id="@+id/icon_2"

            android:layout_width="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_taskview_icon_size"

            android:importantForAccessibility="no"

            android:visibility="gone"

            android:scaleType="centerCrop"



            app:layout_constraintTop_toTopOf="@id/thumbnail_2"

            app:layout_constraintBottom_toBottomOf="@id/thumbnail_2"

            app:layout_constraintStart_toStartOf="@id/thumbnail_2"

            app:layout_constraintEnd_toEndOf="@id/thumbnail_2"/>



    </androidx.constraintlayout.widget.ConstraintLayout>



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

quickstep/res/layout/keyboard_quick_switch_textonly_taskview.xml→quickstep/res/layout/keyboard_quick_switch_desktop_taskview.xml

+16 −12
Original line number Diff line number Diff line
@@ -18,17 +18,20 @@ 
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

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

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

    android:layout_width="@dimen/keyboard_quick_switch_taskview_width"

    android:layout_height="@dimen/keyboard_quick_switch_taskview_height"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:clipToOutline="true"

    android:importantForAccessibility="yes"

    launcher:focusBorderColor="?attr/materialColorOutline">

    launcher:focusBorderColor="?androidprv:attr/materialColorOutline"

    launcher:focusBorderRadius="@dimen/keyboard_quick_switch_text_button_radius">



    <androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@drawable/keyboard_quick_switch_overview_button_background"

        android:layout_width="@dimen/keyboard_quick_switch_text_button_width"

        android:layout_height="@dimen/keyboard_quick_switch_taskview_height"

        android:background="@drawable/keyboard_quick_switch_text_button_background"

        android:backgroundTint="?androidprv:attr/materialColorSurfaceContainer"

        android:paddingHorizontal="@dimen/keyboard_quick_switch_text_button_horizontal_padding"



        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"
@@ -37,10 +40,11 @@ 


        <ImageView

            android:id="@+id/icon"

            android:layout_width="@dimen/keyboard_quick_switch_recents_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_recents_icon_size"

            android:layout_marginBottom="8dp"

            android:tint="?attr/materialColorOnSurface"

            android:layout_width="@dimen/keyboard_quick_switch_desktop_icon_size"

            android:layout_height="@dimen/keyboard_quick_switch_desktop_icon_size"

            android:layout_marginBottom="4dp"

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

            android:src="@drawable/ic_desktop"



            app:layout_constraintVertical_chainStyle="packed"

            app:layout_constraintTop_toTopOf="parent"
@@ -49,9 +53,9 @@ 
            app:layout_constraintEnd_toEndOf="parent"/>



        <TextView

            style="@style/KeyboardQuickSwitchText"

            style="@style/KeyboardQuickSwitchText.OnTaskView"

            android:id="@+id/text"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAlignment="center"

quickstep/res/layout/keyboard_quick_switch_overview_taskview.xml

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

<!-- Copyright (C) 2024 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.launcher3.taskbar.KeyboardQuickSwitchTaskView

    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"

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:clipToOutline="true"

    android:importantForAccessibility="yes"

    launcher:focusBorderColor="?androidprv:attr/materialColorOutline"

    launcher:focusBorderRadius="@dimen/keyboard_quick_switch_text_button_radius">



    <androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/content"

        android:layout_width="@dimen/keyboard_quick_switch_text_button_width"

        android:layout_height="@dimen/keyboard_quick_switch_taskview_height"

        android:background="@drawable/keyboard_quick_switch_text_button_background"

        android:backgroundTint="?androidprv:attr/materialColorSurfaceBright"

        android:paddingHorizontal="@dimen/keyboard_quick_switch_text_button_horizontal_padding"



        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintEnd_toEndOf="parent">



        <TextView

            style="@style/KeyboardQuickSwitchText.LargeText"

            android:id="@+id/large_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textAlignment="center"



            app:layout_constraintVertical_chainStyle="packed"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintBottom_toTopOf="@id/small_text"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"/>



        <TextView

            style="@style/KeyboardQuickSwitchText.OnTaskView"

            android:id="@+id/small_text"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAlignment="center"



            app:layout_constraintTop_toBottomOf="@id/large_text"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintEnd_toEndOf="parent"/>



    </androidx.constraintlayout.widget.ConstraintLayout>



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