Merge "Merge Android 13 QPR2" (050fd1f9) · Commits · e / os / BlissLauncher3

Android.bp

+64 −69

Original line number	Diff line number	Diff line
		@@ -19,6 +19,54 @@ package {

		min_launcher3_sdk_version = "26"

		// Common source files used to build launcher (java and kotlin)
		// All sources are split so they can be reused in many other libraries/apps in other folders
		filegroup {
		name: "launcher-src",
		srcs: [ "src/*/.java", "src/*/.kt" ],
		}

		filegroup {
		name: "launcher-quickstep-src",
		srcs: [ "quickstep/src/*/.java", "quickstep/src/*/.kt" ],
		}

		filegroup {
		name: "launcher-go-src",
		srcs: [ "go/src/*/.java", "go/src/*/.kt" ],
		}

		filegroup {
		name: "launcher-go-quickstep-src",
		srcs: [ "go/quickstep/src/*/.java", "go/quickstep/src/*/.kt" ],
		}

		filegroup {
		name: "launcher-src_shortcuts_overrides",
		srcs: [ "src_shortcuts_overrides/*/.java", "src_shortcuts_overrides/*/.kt" ],
		}

		filegroup {
		name: "launcher-src_ui_overrides",
		srcs: [ "src_ui_overrides/*/.java", "src_ui_overrides/*/.kt" ],
		}

		filegroup {
		name: "launcher-ext_tests",
		srcs: [ "ext_tests/*/.java", "ext_tests/*/.kt" ],
		}

		filegroup {
		name: "launcher-quickstep-ext_tests",
		srcs: [ "quickstep/ext_tests/*/.java", "quickstep/ext_tests/*/.kt" ],
		}

		// Proguard files for Launcher3
		filegroup {
		name: "launcher-proguard-rules",
		srcs: ["proguard.flags"],
		}

		android_library {
		name: "launcher-aosp-tapl",
		libs: [
		@@ -105,6 +153,7 @@ android_library {
		"androidx.cardview_cardview",
		"com.google.android.material_material",
		"iconloader_base",
		"view_capture"
		],
		manifest: "AndroidManifest-common.xml",
		sdk_version: "current",
		@@ -139,14 +188,10 @@ android_app {
		"Launcher3CommonDepsLib",
		],
		srcs: [
		"src/*/.java",
		"src/*/.kt",
		"src_shortcuts_overrides/*/.java",
		"src_shortcuts_overrides/*/.kt",
		"src_ui_overrides/*/.java",
		"src_ui_overrides/*/.kt",
		"ext_tests/src/*/.java",
		"ext_tests/src/*/.kt",
		":launcher-src",
		":launcher-src_shortcuts_overrides",
		":launcher-src_ui_overrides",
		":launcher-ext_tests",
		],
		resource_dirs: [
		"ext_tests/res",
		@@ -202,61 +247,14 @@ android_library {
		}


		// Source code used for test helpers
		filegroup {
		name: "launcher-src-ext-tests",
		srcs: [
		"ext_tests/src/*/.java",
		"ext_tests/src/*/.kt",
		"quickstep/ext_tests/src/*/.java",
		"quickstep/ext_tests/src/*/.kt",
		],
		}

		// Common source files used to build launcher
		filegroup {
		name: "launcher-src-no-build-config",
		srcs: [
		"src/*/.java",
		"src/*/.kt",
		"src_shortcuts_overrides/*/.java",
		"src_shortcuts_overrides/*/.kt",
		"quickstep/src/*/.java",
		"quickstep/src/*/.kt",
		],
		}

		// Common source files used to build go launcher except go/src files
		filegroup {
		name: "launcher-go-src-no-build-config",
		srcs: [
		"src/*/.java",
		"src/*/.kt",
		"quickstep/src/*/.java",
		"quickstep/src/*/.kt",
		"go/quickstep/src/*/.java",
		"go/quickstep/src/*/.kt",
		],
		}

		// Proguard files for Launcher3
		filegroup {
		name: "launcher-proguard-rules",
		srcs: ["proguard.flags"],
		}

		// Library with all the dependencies for building Launcher Go
		android_library {
		name: "LauncherGoResLib",
		srcs: [
		"src/*/.java",
		"src/*/.kt",
		"quickstep/src/*/.java",
		"quickstep/src/*/.kt",
		"go/src/*/.java",
		"go/src/*/.kt",
		"go/quickstep/src/*/.java",
		"go/quickstep/src/*/.kt",
		":launcher-src",
		":launcher-quickstep-src",
		":launcher-go-src",
		":launcher-go-quickstep-src",
		],
		resource_dirs: [
		"go/res",
		@@ -287,7 +285,9 @@ android_library {
		android_library {
		name: "Launcher3QuickStepLib",
		srcs: [
		":launcher-src-no-build-config",
		":launcher-src",
		":launcher-quickstep-src",
		":launcher-src_shortcuts_overrides",
		],
		resource_dirs: [],
		libs: [
		@@ -319,9 +319,9 @@ android_app {
		static_libs: ["Launcher3CommonDepsLib"],

		srcs: [
		"src/*/.java",
		"src_ui_overrides/*/.java",
		"go/src/*/.java",
		":launcher-src",
		":launcher-go-src",
		":launcher-src_ui_overrides",
		],

		resource_dirs: ["go/res"],
		@@ -405,12 +405,7 @@ android_app {
		min_sdk_version: "current",
		target_sdk_version: "current",

		srcs: [
		"src/*/.java",
		"quickstep/src/*/.java",
		"go/src/*/.java",
		"go/quickstep/src/*/.java",
		],
		srcs: [ ],

		resource_dirs: [
		"go/quickstep/res",

AndroidManifest-common.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@
		<!-- for rotating surface by arbitrary degree -->
		<uses-permission android:name="android.permission.ROTATE_SURFACE_FLINGER" />
		<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
		<uses-permission android:name="android.permission.READ_HOME_APP_SEARCH_DATA" />

		<!--
		Permissions required for read/write access to the workspace data. These permission name

ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java

+22 −6

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.launcher3.testing;

		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
		import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;

		import android.app.Activity;
		import android.app.Application;
		@@ -209,12 +210,19 @@ public class DebugTestInformationHandler extends TestInformationHandler {
		}

		case TestProtocol.REQUEST_USE_TEST_WORKSPACE_LAYOUT: {
		useTestWorkspaceLayout(true);
		useTestWorkspaceLayout(
		LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TEST);
		return response;
		}

		case TestProtocol.REQUEST_USE_TEST2_WORKSPACE_LAYOUT: {
		useTestWorkspaceLayout(
		LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TEST2);
		return response;
		}

		case TestProtocol.REQUEST_USE_DEFAULT_WORKSPACE_LAYOUT: {
		useTestWorkspaceLayout(false);
		useTestWorkspaceLayout(null);
		return response;
		}

		@@ -248,17 +256,25 @@ public class DebugTestInformationHandler extends TestInformationHandler {
		return response;
		}

		case TestProtocol.REQUEST_MODEL_QUEUE_CLEARED:
		return getFromExecutorSync(MODEL_EXECUTOR, Bundle::new);

		default:
		return super.call(method, arg, extras);
		}
		}

		private void useTestWorkspaceLayout(boolean useTestWorkspaceLayout) {
		private void useTestWorkspaceLayout(String layout) {
		final long identity = Binder.clearCallingIdentity();
		try {
		LauncherSettings.Settings.call(mContext.getContentResolver(), useTestWorkspaceLayout
		? LauncherSettings.Settings.METHOD_SET_USE_TEST_WORKSPACE_LAYOUT_FLAG
		: LauncherSettings.Settings.METHOD_CLEAR_USE_TEST_WORKSPACE_LAYOUT_FLAG);
		if (layout != null) {
		LauncherSettings.Settings.call(mContext.getContentResolver(),
		LauncherSettings.Settings.METHOD_SET_USE_TEST_WORKSPACE_LAYOUT_FLAG,
		layout);
		} else {
		LauncherSettings.Settings.call(mContext.getContentResolver(),
		LauncherSettings.Settings.METHOD_CLEAR_USE_TEST_WORKSPACE_LAYOUT_FLAG);
		}
		} finally {
		Binder.restoreCallingIdentity(identity);
		}

go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -50,8 +50,8 @@ import androidx.annotation.IntDef;
		import androidx.annotation.VisibleForTesting;

		import com.android.launcher3.BaseActivity;
		import com.android.launcher3.LauncherPrefs;
		import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.views.ArrowTipView;
		import com.android.quickstep.util.AssistContentRequester;
		import com.android.quickstep.util.RecentsOrientedState;
		@@ -124,7 +124,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
		AssistContentRequester assistContentRequester) {
		super(taskThumbnailView);
		mFactoryContentRequester = assistContentRequester;
		mSharedPreferences = Utilities.getPrefs(mApplicationContext);
		mSharedPreferences = LauncherPrefs.getPrefs(mApplicationContext);
		}

		/**
		@@ -151,7 +151,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
		boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot() && !isManagedProfileTask;
		getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task));
		mTaskPackageName = task.key.getPackageName();
		mSharedPreferences = Utilities.getPrefs(mApplicationContext);
		mSharedPreferences = LauncherPrefs.getPrefs(mApplicationContext);
		checkSettings();

		if (!mAssistStructurePermitted \|\| !mAssistScreenshotPermitted

go/src/com/android/launcher3/model/WidgetsModel.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -41,10 +41,8 @@ import java.util.Set;
		*/
		public class WidgetsModel {

		// True if the widget support is disabled.
		// True is the widget support is disabled.
		public static final boolean GO_DISABLE_WIDGETS = true;
		// True if the shortcut support is disabled.
		public static final boolean GO_DISABLE_SHORTCUTS = true;
		public static final boolean GO_DISABLE_NOTIFICATION_DOTS = true;

		private static final ArrayList<WidgetsListBaseEntry> EMPTY_WIDGET_LIST = new ArrayList<>();