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

Commit 1695cc72 authored by Pat Manning's avatar Pat Manning Committed by Alex Chau
Browse files

Create icon app chip menu for overview tasks. 

Fix: 257951354
Test: TaplTestsQuickstep
Test: TaplTestsSplitscreen
Flag: ENABLE_OVERVIEW_ICON_MENU
Change-Id: Id8a14b1970ae42bcc74e95419caeaf52ef63638b
parent 00a33996

aconfig/launcher.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -34,3 +34,10 @@ flag { 
    description: "Enables new workspace grid calculations method."

    bug: "241386436"

}



flag {

    name: "enable_overview_icon_menu"

    namespace: "launcher"

    description: "Enable updated overview icon and menu within task."

    bug: "257950105"

}

quickstep/res/drawable/ic_chevron_down.xml

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

<!-- Copyright (C) 2023 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.

-->

<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:aapt="http://schemas.android.com/aapt"

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

    <target android:name="scaleGroup">

        <aapt:attr name="android:animation">

            <objectAnimator

                android:duration="150"

                android:propertyName="scaleX"

                android:valueFrom="1"

                android:valueTo="-1" />

        </aapt:attr>

    </target>

    <aapt:attr name="android:drawable">

        <vector

            android:width="48dp"

            android:height="48dp"

            android:autoMirrored="true"

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

            android:viewportHeight="48"

            android:viewportWidth="48">

            <group

                android:name="scaleGroup"

                android:pivotX="24"

                android:pivotY="24"

                android:rotation="90">

                <path

                    android:fillColor="@android:color/white"

                    android:pathData="M18.75,36 L16.6,33.85 26.5,23.95 16.6,14.05 18.75,11.9 30.8,23.95Z" />

            </group>

        </vector>

    </aapt:attr>

</animated-vector>

quickstep/res/layout/icon_app_chip_view.xml

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

<!--

     Copyright (C) 2023 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.IconAppChipView

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

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

    android:id="@+id/icon"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:focusable="false"

    android:importantForAccessibility="no"

    android:autoMirrored="true"

    android:elevation="@dimen/task_thumbnail_icon_menu_elevation" >



    <ImageView

        android:id="@+id/icon_view_background"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:background="@drawable/icon_menu_background"

        android:importantForAccessibility="no" />



    <com.android.quickstep.views.IconView

        android:id="@+id/icon_view"

        android:layout_width="@dimen/task_thumbnail_icon_size"

        android:layout_height="@dimen/task_thumbnail_icon_size"

        android:focusable="false"

        android:importantForAccessibility="no" />



    <TextView

        android:id="@+id/icon_text"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center_vertical"

        android:maxLines="1"

        android:textAlignment="viewStart"

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

        android:textSize="16sp"

        android:importantForAccessibility="no" />



    <ImageView

        android:id="@+id/icon_arrow"

        android:layout_width="@dimen/task_thumbnail_icon_menu_arrow_size"

        android:layout_height="match_parent"

        android:background="@drawable/icon_menu_arrow_background"

        android:src="@drawable/ic_chevron_down"

        android:importantForAccessibility="no" />

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

quickstep/res/layout/icon_view.xml

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

<!--

     Copyright (C) 2023 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.IconView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />
 
 No newline at end of file

quickstep/res/layout/task.xml

+4 −5
Original line number Diff line number Diff line
@@ -44,10 +44,9 @@ 
        android:importantForAccessibility="no"

        android:src="@drawable/ic_select_windows" />



    <com.android.quickstep.views.IconView

    <ViewStub

        android:id="@+id/icon"

        android:layout_width="@dimen/task_thumbnail_icon_size"

        android:layout_height="@dimen/task_thumbnail_icon_size"

        android:focusable="false"

        android:importantForAccessibility="no"/>

        android:inflatedId="@id/icon"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content" />

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