Merge "Add the KeyboardQuickSwitchView (1/2)" into tm-qpr-dev (673e6437) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/res/layout/task.xml

+4 −1

Original line number	Diff line number	Diff line
		@@ -17,11 +17,14 @@
		file, they need to be loaded at runtime. -->
		<com.android.quickstep.views.TaskView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		xmlns:launcher="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:defaultFocusHighlightEnabled="false"
		android:focusable="true">
		android:focusable="true"
		launcher:borderColor="?androidprv:attr/colorAccentSecondaryVariant">

		<com.android.quickstep.views.TaskThumbnailView
		android:id="@+id/snapshot"

+4 −1

Original line number	Diff line number	Diff line
		@@ -22,11 +22,14 @@

		<com.android.quickstep.views.GroupedTaskView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
		xmlns:launcher="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:defaultFocusHighlightEnabled="false"
		android:focusable="true">
		android:focusable="true"
		launcher:borderColor="?androidprv:attr/colorAccentSecondaryVariant">

		<com.android.quickstep.views.TaskThumbnailView
		android:id="@+id/snapshot"

+9 −0

Original line number	Diff line number	Diff line
		@@ -19,4 +19,13 @@
		<attr name="android:textSize"/>
		<attr name="android:fontFamily"/>
		</declare-styleable>

		<!--
		TaskView specific attributes. These attributes are used to customize a TaskView view in
		XML files.
		-->
		<declare-styleable name="TaskView">
		<!-- Border color for a keyboard quick switch task views -->
		<attr name="borderColor" format="color" />
		</declare-styleable>
		</resources>

+3 −0

Original line number	Diff line number	Diff line
		@@ -328,4 +328,7 @@
		<!-- Note: keep this value in sync with the WindowManager/Shell dimens.xml -->
		<!-- starting_surface_exit_animation_window_shift_length -->
		<dimen name="starting_surface_exit_animation_window_shift_length">20dp</dimen>

		<!-- Keyboard Quick Switch -->
		<dimen name="keyboard_quick_switch_border_width">4dp</dimen>
		</resources>

+13 −5

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.annotation.ColorInt;
		import android.os.RemoteException;
		import android.util.Log;
		import android.view.TaskTransitionSpec;
		import android.view.View;
		import android.view.WindowManagerGlobal;

		import androidx.annotation.NonNull;
		@@ -49,6 +50,7 @@ import com.android.launcher3.util.DisplayController;
		import com.android.launcher3.util.MultiPropertyFactory;
		import com.android.launcher3.util.OnboardingPrefs;
		import com.android.quickstep.RecentsAnimationCallbacks;
		import com.android.quickstep.util.GroupTask;
		import com.android.quickstep.views.RecentsView;

		import java.io.PrintWriter;
		@@ -379,6 +381,17 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		.getValue() == 0;
		}

		@Override
		public RecentsView getRecentsView() {
		return mLauncher.getOverviewPanel();
		}

		@Override
		public void launchSplitTasks(View taskView, GroupTask groupTask) {
		super.launchSplitTasks(taskView, groupTask);
		mLauncher.launchSplitTasks(taskView, groupTask);
		}

		@Override
		public void dumpLogs(String prefix, PrintWriter pw) {
		super.dumpLogs(prefix, pw);
		@@ -399,9 +412,4 @@ public class LauncherTaskbarUIController extends TaskbarUIController {

		mTaskbarLauncherStateController.dumpLogs(prefix + "\t", pw);
		}

		@Override
		public RecentsView getRecentsView() {
		return mLauncher.getOverviewPanel();
		}
		}