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

Commit 24898d3b authored by Greg Kaiser's avatar Greg Kaiser Committed by Alex Chau
Browse files

Revert "launcher: use a different task menu for foldables" 

This reverts commit 10eb3cd9.

Reason for revert: Root cause of P0 b/205278434
Bug: 205278434
Bug: 193432925
Test: Local reverted and now launcher works on wembley

Change-Id: I3605c01066a3ce383d45e0a938f1e00b3c7f7bb9
Merged-In: I5ee18d3ee1b671fcaedda633e7a268addd5c5c15
parent 10eb3cd9

Android.bp

+5 −4
Original line number Diff line number Diff line
@@ -258,8 +258,8 @@ android_library { 
        "go/quickstep/res",

    ],

    static_libs: [

        "QuickstepResLib",

        "Launcher3CommonDepsLib",

        "QuickstepResLib",

    ],

    manifest: "quickstep/AndroidManifest-launcher.xml",

    additional_manifests: [
@@ -278,15 +278,16 @@ android_library { 
    srcs: [

        ":launcher-src-no-build-config",

    ],

    resource_dirs: [],

    resource_dirs: [

        "quickstep/res",

    ],

    libs: [

        "framework-statsd",

    ],

    static_libs: [

        "QuickstepResLib",

        "SystemUI-statsd",

        "SystemUISharedLib",

        "Launcher3CommonDepsLib",

        "Launcher3CommonDepsLib"

    ],

    manifest: "quickstep/AndroidManifest.xml",

    platform_apis: true,

quickstep/res/drawable/task_menu_item_bg.xml

+3 −4
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 
     limitations under the License.

-->



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

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

    <solid android:color="?androidprv:attr/colorSurface" />

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

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

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

</shape>

quickstep/res/layout/task_menu_with_arrow.xml

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

<!--

     Copyright (C) 2021 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.TaskMenuViewWithArrow

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:animateLayoutChanges="true"

    android:background="@drawable/task_menu_bg"

    android:orientation="vertical"

    android:visibility="invisible">



    <LinearLayout

        android:id="@+id/menu_option_layout"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:showDividers="middle" />



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

quickstep/res/layout/task_view_menu_option.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:orientation="vertical"

    android:paddingTop="@dimen/task_card_menu_option_vertical_padding"

    android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"

    android:background="@drawable/task_menu_item_bg"

quickstep/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    <dimen name="task_menu_corner_radius">22dp</dimen>

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

    <dimen name="task_menu_spacing">2dp</dimen>

    <dimen name="task_menu_width_grid">234dp</dimen>

    <dimen name="task_menu_width_grid">200dp</dimen>

    <dimen name="overview_proactive_row_height">48dp</dimen>

    <dimen name="overview_proactive_row_bottom_margin">16dp</dimen>
@@ -90,7 +90,7 @@ 
    <dimen name="task_menu_vertical_padding">8dp</dimen>

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

    <dimen name="task_card_menu_shadow_height">3dp</dimen>

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

    <dimen name="task_menu_option_start_margin">12dp</dimen>

    <!-- Copied from framework resource:

       docked_stack_divider_thickness - 2 * docked_stack_divider_insets -->

    <dimen name="multi_window_task_divider_size">10dp</dimen>