Merge "Update save app pair icon" into 24D1-dev (370d05a2) · Commits · e / os / BlissLauncher3

go/quickstep/res/layout/overview_actions_container.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@
		style="@style/GoOverviewActionButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:drawableStart="@drawable/ic_save_app_pair"
		android:drawableStart="@drawable/ic_save_app_pair_up_down"
		android:text="@string/action_save_app_pair"
		android:theme="@style/ThemeControlHighlightWorkspaceColor"
		android:visibility="gone" />

quickstep/res/drawable/ic_save_app_pair.xml→quickstep/res/drawable/ic_save_app_pair_left_right.xml

+28 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>

		<!--
		Copyright (C) 2023 The Android Open Source Project
		Copyright (C) 2024 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.
		@@ -22,7 +22,7 @@
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:pathData="M13.329,2.305H4.242C2.751,2.305 1.542,3.514 1.542,5.005V13.005C1.542,14.496 2.751,15.705 4.242,15.705H7.875V19.011C7.875,20.502 9.084,21.711 10.575,21.711H19.662C21.153,21.711 22.362,20.502 22.362,19.011V10.011C22.362,8.52 21.153,7.311 19.662,7.311H16.029V5.005C16.029,3.514 14.821,2.305 13.329,2.305ZM14.329,7.311V5.005C14.329,4.452 13.882,4.005 13.329,4.005H4.242C3.69,4.005 3.242,4.452 3.242,5.005V13.005C3.242,13.557 3.69,14.005 4.242,14.005H7.875V10.011C7.875,8.52 9.084,7.311 10.575,7.311H14.329ZM9.575,14.005V10.011C9.575,9.611 9.81,9.266 10.15,9.106C10.285,9.037 10.438,8.999 10.6,8.999H19.687C20.239,8.999 20.687,9.447 20.687,9.999V18.999C20.687,19.399 20.452,19.744 20.113,19.904C19.977,19.972 19.824,20.011 19.662,20.011H10.575C10.023,20.011 9.575,19.563 9.575,19.011V15.705H9.6V14.005H9.575ZM15.542,11.996V14H17.588V15H15.542V16.996H14.542V15H12.464V14H14.542V11.996H15.542Z"
		android:fillColor="#000000"
		android:pathData="M8.5,4.5H3.5C2.4,4.5 1.5,5.4 1.5,6.5V18.5C1.5,19.6 2.4,20.5 3.5,20.5H8.5C9.6,20.5 10.5,19.6 10.5,18.5V6.5C10.5,5.4 9.6,4.5 8.5,4.5ZM8.5,18.5H3.5V6.5H8.5V18.5ZM14.5,6.5H19.5V13.5H21.5V6.5C21.5,5.4 20.6,4.5 19.5,4.5H14.5C13.4,4.5 12.5,5.4 12.5,6.5V18.5C12.5,19.6 13.4,20.5 14.5,20.5H15.5V18.5H14.5V6.5ZM20.5,14.5V16.5H22.5V18.5H20.5V20.5H18.5V18.5H16.5V16.5H18.5V14.5H20.5Z"
		android:fillColor="#48473A"
		android:fillType="evenOdd"/>
		</vector>

quickstep/res/drawable/ic_save_app_pair_up_down.xml

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>

		<!--
		Copyright (C) 2024 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.
		-->

		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:pathData="M18,2L6,2C4.9,2 4,2.9 4,4L4,9C4,10.1 4.9,11 6,11L18,11C19.1,11 20,10.1 20,9L20,4C20,2.9 19.1,2 18,2ZM18,9L6,9L6,4L18,4L18,9ZM18,13L6,13C4.9,13 4,13.9 4,15L4,20C4,21.1 4.9,22 6,22L13,22L13,20L6,20L6,15L18,15L18,16L20,16L20,15C20,13.9 19.1,13 18,13ZM16,17L18,17L18,19L20,19L20,21L18,21L18,23L16,23L16,21L14,21L14,19L16,19L16,17Z"
		android:fillColor="#48473A"
		android:fillType="evenOdd"/>
		</vector>

quickstep/src/com/android/quickstep/TaskShortcutFactory.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -134,8 +134,9 @@ public interface TaskShortcutFactory {
		class SaveAppPairSystemShortcut extends SystemShortcut<BaseDraggingActivity> {
		private final GroupedTaskView mTaskView;

		public SaveAppPairSystemShortcut(BaseDraggingActivity activity, GroupedTaskView taskView) {
		super(R.drawable.ic_save_app_pair, R.string.save_app_pair, activity,
		public SaveAppPairSystemShortcut(BaseDraggingActivity activity, GroupedTaskView taskView,
		int iconResId) {
		super(iconResId, R.string.save_app_pair, activity,
		taskView.getItemInfo(), taskView);
		mTaskView = taskView;
		}
		@@ -332,8 +333,12 @@ public interface TaskShortcutFactory {
		return null;
		}

		int iconResId = deviceProfile.isLeftRightSplit
		? R.drawable.ic_save_app_pair_left_right
		: R.drawable.ic_save_app_pair_up_down;

		return Collections.singletonList(
		new SaveAppPairSystemShortcut(activity, (GroupedTaskView) taskView));
		new SaveAppPairSystemShortcut(activity, (GroupedTaskView) taskView, iconResId));
		}

		@Override

quickstep/src/com/android/quickstep/views/OverviewActionsView.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -393,7 +393,11 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
		? R.drawable.ic_split_horizontal
		: R.drawable.ic_split_vertical;
		mSplitButton.setCompoundDrawablesRelativeWithIntrinsicBounds(splitIconRes, 0, 0, 0);

		int appPairIconRes = dp.isLeftRightSplit
		? R.drawable.ic_save_app_pair_left_right
		: R.drawable.ic_save_app_pair_up_down;
		mSaveAppPairButton.setCompoundDrawablesRelativeWithIntrinsicBounds(
		R.drawable.ic_save_app_pair, 0, 0, 0);
		appPairIconRes, 0, 0, 0);
		}
		}