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

Commit 3a2a69ab authored by Charlie Anderson's avatar Charlie Anderson
Browse files

Fixes tests and issues when toggling new app shortcut popup flag. 

Bug: 247880037
Test: manually tested app popup. Also ran Launcher tests locally with U flag on/off.
Change-Id: I93c04f9715d583376c36d823c23353619afd26b6
parent b4af2072

res/layout/system_shortcut_icons_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<LinearLayout

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

    android:id="@+id/system_shortcut_icons"

    android:id="@+id/system_shortcuts_container"

    android:layout_width="match_parent"

    android:layout_height="@dimen/system_shortcut_header_height"

    android:orientation="horizontal"

res/layout/system_shortcut_icons_container_material_u.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<LinearLayout

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

    android:id="@+id/system_shortcut_icons"

    android:id="@+id/system_shortcuts_container"

    android:tag="@string/popup_container_iterate_children"

    android:layout_width="match_parent"

    android:layout_height="@dimen/system_shortcut_header_height"

res/layout/system_shortcut_rows_container.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
<LinearLayout

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

    android:id="@+id/system_shortcuts_container"

    android:background="@drawable/popup_background_material_u"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:tag="@string/popup_container_iterate_children"

res/layout/system_shortcut_rows_container_material_u.xml

0 → 100644
+25 −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.

-->



<LinearLayout

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

    android:id="@+id/system_shortcuts_container"

    android:background="@drawable/popup_background_material_u"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:tag="@string/popup_container_iterate_children"

    android:elevation="@dimen/deep_shortcuts_elevation"

    android:orientation="vertical"/>

src/com/android/launcher3/popup/PopupContainerWithArrow.java

+6 −3
Original line number Diff line number Diff line
@@ -327,11 +327,14 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext> 
            initializeSystemShortcuts(systemShortcuts);

        } else {

            mDeepShortcutContainer.setVisibility(View.GONE);

            mSystemShortcutContainer = inflateAndAdd(R.layout.system_shortcut_rows_container,

                    this, 0);

            mWidgetContainer = mSystemShortcutContainer;

            if (!shortcuts.isEmpty()) {

                for (int i = 0; i < shortcuts.size(); i++) {

                    initializeSystemShortcut(

                            R.layout.system_shortcut,

                            this,

                            mSystemShortcutContainer,

                            shortcuts.get(i),

                            i < shortcuts.size() - 1);

                }
@@ -358,7 +361,7 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext> 
            addAllShortcutsMaterialU(deepShortcutCount, systemShortcuts);

        } else if (!systemShortcuts.isEmpty()) {

            addSystemShortcutsMaterialU(systemShortcuts,

                    R.layout.system_shortcut_rows_container,

                    R.layout.system_shortcut_rows_container_material_u,

                    R.layout.system_shortcut);

        }

        show();
@@ -395,7 +398,7 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext> 
        if (deepShortcutCount + systemShortcuts.size() <= SHORTCUT_COLLAPSE_THRESHOLD) {

            // add all system shortcuts including widgets shortcut to same container

            addSystemShortcutsMaterialU(systemShortcuts,

                    R.layout.system_shortcut_rows_container,

                    R.layout.system_shortcut_rows_container_material_u,

                    R.layout.system_shortcut);

            addDeepShortcutsMaterialU(deepShortcutCount);

            return;