PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes tests and issues when toggling new app shortcut popup flag." into tm-qpr-dev am: d4eed6ec90 am: cd6fd73639

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

Change-Id: Id79a204f2f489e35829f2336743d1a06cd0d9908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Charlie Anderson
2023-03-17 01:21:16 +00:00
committed by Automerger Merge Worker
parent 678da0e9c4 cd6fd73639
commit 7c7ccbb2ad
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout/system_shortcut_icons_container.xml
+1 -1
View File
@@ -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
View File
@@ -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
-1
View File
@@ -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
+25
View File
@@ -0,0 +1,25 @@
<?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
View File
@@ -320,11 +320,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);
}
@@ -351,7 +354,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();
@@ -388,7 +391,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;