Merge "Use overridden default xml for TwoPanelWorkspaceTest" into tm-qpr-dev (0c2d7e8d) · Commits · e / os / BlissLauncher3

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

+18 −6

Original line number	Diff line number	Diff line
		@@ -210,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;
		}

		@@ -257,12 +264,17 @@ public class DebugTestInformationHandler extends TestInformationHandler {
		}
		}

		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);
		}

res/xml/default_test2_workspace.xml

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Split display specific version of Launcher3/res/xml/default_workspace_4x4.xml -->
		<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" >

		<!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
		<!-- Dialer Messaging Chrome Camera -->
		<favorite
		launcher:container="-101"
		launcher:screen="0"
		launcher:x="0"
		launcher:y="0"
		launcher:className="com.google.android.dialer.extensions.GoogleDialtactsActivity"
		launcher:packageName="com.google.android.dialer" />

		<favorite
		launcher:container="-101"
		launcher:screen="1"
		launcher:x="1"
		launcher:y="0"
		launcher:className="com.google.android.apps.messaging.ui.ConversationListActivity"
		launcher:packageName="com.google.android.apps.messaging" />

		<favorite
		launcher:container="-101"
		launcher:screen="2"
		launcher:x="2"
		launcher:y="0"
		launcher:className="com.google.android.apps.chrome.Main"
		launcher:packageName="com.android.chrome" />

		<favorite
		launcher:container="-101"
		launcher:screen="3"
		launcher:x="3"
		launcher:y="0"
		launcher:className="com.android.camera.CameraLauncher"
		launcher:packageName="com.google.android.GoogleCamera" />

		<!-- Bottom row -->
		<!-- Maps [space] [space] Play -->
		<favorite
		launcher:className="com.google.android.maps.MapsActivity"
		launcher:packageName="com.google.android.apps.maps"
		launcher:screen="0"
		launcher:x="0"
		launcher:y="-1" />

		<favorite
		launcher:className="com.android.vending.AssetBrowserActivity"
		launcher:packageName="com.android.vending"
		launcher:screen="0"
		launcher:x="3"
		launcher:y="-1" />

		<!-- TODO: Place weather widget when it's available -->

		</favorites>

src/com/android/launcher3/LauncherProvider.java

+16 −5

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ public class LauncherProvider extends ContentProvider {
		public static final String KEY_LAYOUT_PROVIDER_AUTHORITY = "KEY_LAYOUT_PROVIDER_AUTHORITY";

		private static final int TEST_WORKSPACE_LAYOUT_RES_XML = R.xml.default_test_workspace;
		private static final int TEST2_WORKSPACE_LAYOUT_RES_XML = R.xml.default_test2_workspace;

		static final String EMPTY_DATABASE_CREATED = "EMPTY_DATABASE_CREATED";

		@@ -114,7 +115,7 @@ public class LauncherProvider extends ContentProvider {

		private long mLastRestoreTimestamp = 0L;

		private boolean mUseTestWorkspaceLayout;
		private int mDefaultWorkspaceLayoutOverride = 0;

		/**
		* $ adb shell dumpsys activity provider com.android.launcher3
		@@ -402,11 +403,21 @@ public class LauncherProvider extends ContentProvider {
		return null;
		}
		case LauncherSettings.Settings.METHOD_SET_USE_TEST_WORKSPACE_LAYOUT_FLAG: {
		mUseTestWorkspaceLayout = true;
		switch (arg) {
		case LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TEST:
		mDefaultWorkspaceLayoutOverride = TEST_WORKSPACE_LAYOUT_RES_XML;
		break;
		case LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TEST2:
		mDefaultWorkspaceLayoutOverride = TEST2_WORKSPACE_LAYOUT_RES_XML;
		break;
		default:
		mDefaultWorkspaceLayoutOverride = 0;
		break;
		}
		return null;
		}
		case LauncherSettings.Settings.METHOD_CLEAR_USE_TEST_WORKSPACE_LAYOUT_FLAG: {
		mUseTestWorkspaceLayout = false;
		mDefaultWorkspaceLayoutOverride = 0;
		return null;
		}
		case LauncherSettings.Settings.METHOD_LOAD_DEFAULT_FAVORITES: {
		@@ -628,8 +639,8 @@ public class LauncherProvider extends ContentProvider {

		private DefaultLayoutParser getDefaultLayoutParser(LauncherWidgetHolder widgetHolder) {
		InvariantDeviceProfile idp = LauncherAppState.getIDP(getContext());
		int defaultLayout = mUseTestWorkspaceLayout
		? TEST_WORKSPACE_LAYOUT_RES_XML : idp.defaultLayoutId;
		int defaultLayout = mDefaultWorkspaceLayoutOverride > 0
		? mDefaultWorkspaceLayoutOverride : idp.defaultLayoutId;

		if (getContext().getSystemService(UserManager.class).isDemoUser()
		&& idp.demoModeLayoutId != 0) {

src/com/android/launcher3/LauncherSettings.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -377,6 +377,8 @@ public class LauncherSettings {

		public static final String METHOD_SET_USE_TEST_WORKSPACE_LAYOUT_FLAG =
		"set_use_test_workspace_layout_flag";
		public static final String ARG_DEFAULT_WORKSPACE_LAYOUT_TEST = "default_test_workspace";
		public static final String ARG_DEFAULT_WORKSPACE_LAYOUT_TEST2 = "default_test2_workspace";

		public static final String METHOD_CLEAR_USE_TEST_WORKSPACE_LAYOUT_FLAG =
		"clear_use_test_workspace_layout_flag";

src/com/android/launcher3/testing/shared/TestProtocol.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ public final class TestProtocol {
		public static final String REQUEST_STOP_EVENT_LOGGING = "stop-event-logging";
		public static final String REQUEST_CLEAR_DATA = "clear-data";
		public static final String REQUEST_USE_TEST_WORKSPACE_LAYOUT = "use-test-workspace-layout";
		public static final String REQUEST_USE_TEST2_WORKSPACE_LAYOUT = "use-test2-workspace-layout";
		public static final String REQUEST_USE_DEFAULT_WORKSPACE_LAYOUT =
		"use-default-workspace-layout";
		public static final String REQUEST_HOTSEAT_ICON_NAMES = "get-hotseat-icon-names";