Merge "Remove ENABLE_MATERIAL_U_POPUP flag and cleanup dead code" into main (d48f89be) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/res/layout/taskbar_divider_popup_menu.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		android:layout_width="@dimen/taskbar_pinning_popup_menu_width"
		android:layout_height="wrap_content"
		android:focusable="true"
		android:background="@drawable/popup_background_material_u"
		android:background="@drawable/popup_background"
		android:orientation="vertical">

		<LinearLayout

+2 −13

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		*/
		package com.android.launcher3.taskbar;

		import static com.android.launcher3.config.FeatureFlags.ENABLE_MATERIAL_U_POPUP;
		import static com.android.launcher3.util.SplitConfigurationOptions.getLogEventForPosition;

		import android.content.Intent;
		@@ -163,19 +162,9 @@ public class TaskbarPopupController implements TaskbarControllers.LoggableTaskba
		.filter(Objects::nonNull)
		.collect(Collectors.toList());

		if (ENABLE_MATERIAL_U_POPUP.get()) {
		container = (PopupContainerWithArrow) context.getLayoutInflater().inflate(
		R.layout.popup_container_material_u, context.getDragLayer(), false);
		container.populateAndShowRowsMaterialU(icon, deepShortcutCount, systemShortcuts);
		} else {
		container = (PopupContainerWithArrow) context.getLayoutInflater().inflate(
		R.layout.popup_container, context.getDragLayer(), false);
		container.populateAndShow(
		icon,
		deepShortcutCount,
		mPopupDataProvider.getNotificationKeysForItem(item),
		systemShortcuts);
		}
		container.populateAndShowRows(icon, deepShortcutCount, systemShortcuts);

		container.addOnAttachStateChangeListener(
		new PopupLiveUpdateHandler<BaseTaskbarContext>(context, container) {

+0 −0

File moved.

+3 −5

Original line number	Diff line number	Diff line
		@@ -13,10 +13,10 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<com.android.launcher3.shortcuts.DeepShortcutView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:launcher="http://schemas.android.com/apk/res-auto"
		android:id="@+id/deep_shortcut_material"
		android:layout_width="@dimen/bg_popup_item_width"
		android:layout_height="@dimen/bg_popup_item_height"
		android:elevation="@dimen/deep_shortcuts_elevation"
		@@ -31,12 +31,11 @@
		android:textAlignment="viewStart"
		android:paddingStart="@dimen/deep_shortcuts_text_padding_start"
		android:paddingEnd="@dimen/popup_padding_end"
		android:drawableEnd="@drawable/ic_drag_handle"
		android:drawablePadding="@dimen/deep_shortcut_drawable_padding"
		android:singleLine="true"
		android:ellipsize="end"
		android:textSize="14sp"
		android:textColor="?android:attr/textColorPrimary"
		android:textColor="?attr/popupTextColor"
		launcher:layoutHorizontal="true"
		launcher:iconDisplay="shortcut_popup"
		launcher:iconSizeOverride="@dimen/deep_shortcut_icon_size" />
		@@ -48,5 +47,4 @@
		android:layout_marginStart="@dimen/popup_padding_start"
		android:layout_gravity="start\|center_vertical"
		android:background="@drawable/ic_deepshortcut_placeholder"/>

		</com.android.launcher3.shortcuts.DeepShortcutView>
		No newline at end of file

+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/deep_shortcuts_container"
		android:background="@drawable/popup_background_material_u"
		android:background="@drawable/popup_background"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:tag="@string/popup_container_iterate_children"