Merge "Fixes tests and issues when toggling new app shortcut popup flag." into tm-qpr-dev (d4eed6ec) · Commits · e / os / android_packages_apps_Trebuchet

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"

+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"

+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"

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"/>

+6 −3

Original line number	Diff line number	Diff line
		@@ -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;