Merge "Merging from ub-launcher3-master @ build 6682763" (aea3ec06) · Commits · e / os / android_packages_apps_Trebuchet

AndroidManifest-common.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -46,9 +46,6 @@
		<uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
		<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />

		<!-- TODO(b/150802536): Enabled only for ENABLE_FIXED_ROTATION_TRANSFORM feature flag -->
		<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>

		<!--
		Permissions required for read/write access to the workspace data. These permission name
		should not conflict with that defined in other apps, as such an app should embed its package

+6 −0

Original line number	Diff line number	Diff line
		@@ -164,6 +164,12 @@ public class DebugTestInformationHandler extends TestInformationHandler {
		}

		case TestProtocol.REQUEST_GET_TEST_EVENTS: {
		if (sEvents == null) {
		// sEvents can be null if Launcher died and restarted after
		// REQUEST_START_EVENT_LOGGING.
		return response;
		}

		synchronized (sEvents) {
		response.putStringArrayList(
		TestProtocol.TEST_INFO_RESPONSE_FIELD, new ArrayList<>(sEvents));

+2 −2

Original line number	Diff line number	Diff line
		@@ -53,8 +53,8 @@
		android:resizeableActivity="true"
		android:resumeWhilePausing="true"
		android:taskAffinity=""
		android:enabled="true"
		android:exported="true">
		android:exported="true"
		android:enabled="true">
		<intent-filter>
		<action android:name="android.intent.action.MAIN" />
		<category android:name="android.intent.category.HOME" />

+9 −10

Original line number	Diff line number	Diff line
		@@ -94,8 +94,7 @@
		android:clearTaskOnLaunch="true"
		android:exported="false"/>

		<activity
		android:name="com.android.quickstep.interaction.GestureSandboxActivity"
		<activity android:name="com.android.quickstep.interaction.GestureSandboxActivity"
		android:autoRemoveFromRecents="true"
		android:excludeFromRecents="true"
		android:screenOrientation="portrait"

+1 −12

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ public class PredictionAppTracker extends AppLaunchTracker

		// Accessed only on worker thread
		private AppPredictor mHomeAppPredictor;
		private AppPredictor mRecentsOverviewPredictor;

		public PredictionAppTracker(Context context) {
		mContext = context;
		@@ -97,10 +96,6 @@ public class PredictionAppTracker extends AppLaunchTracker
		mHomeAppPredictor.destroy();
		mHomeAppPredictor = null;
		}
		if (mRecentsOverviewPredictor != null) {
		mRecentsOverviewPredictor.destroy();
		mRecentsOverviewPredictor = null;
		}
		}

		@WorkerThread
		@@ -142,7 +137,6 @@ public class PredictionAppTracker extends AppLaunchTracker
		// Initialize the clients
		int count = InvariantDeviceProfile.INSTANCE.get(mContext).numAllAppsColumns;
		mHomeAppPredictor = createPredictor(Client.HOME, count);
		mRecentsOverviewPredictor = createPredictor(Client.OVERVIEW, count);
		return true;
		}
		case MSG_DESTROY: {
		@@ -157,12 +151,7 @@ public class PredictionAppTracker extends AppLaunchTracker
		}
		case MSG_PREDICT: {
		if (mHomeAppPredictor != null) {
		String client = (String) msg.obj;
		if (Client.HOME.id.equals(client)) {
		mHomeAppPredictor.requestPredictionUpdate();
		} else {
		mRecentsOverviewPredictor.requestPredictionUpdate();
		}
		}
		return true;
		}