Merge Android U (ab/10368041) (41dd5f48) · Commits · e / os / android_packages_apps_Trebuchet

Android.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ android_library {
		"androidx.test.uiautomator_uiautomator",
		"androidx.preference_preference",
		"SystemUISharedLib",
		"SystemUIAnimationLib",
		"animationlib",
		"launcher-testing-shared",
		],
		srcs: [
		@@ -243,7 +243,7 @@ android_library {
		"lottie",
		"SystemUISharedLib",
		"SystemUI-statsd",
		"SystemUIAnimationLib",
		"animationlib",
		],
		manifest: "quickstep/AndroidManifest.xml",
		min_sdk_version: "current",
		@@ -305,7 +305,7 @@ android_library {
		"SystemUISharedLib",
		"Launcher3CommonDepsLib",
		"QuickstepResLib",
		"SystemUIAnimationLib",
		"animationlib",
		],
		manifest: "quickstep/AndroidManifest.xml",
		platform_apis: true,

AndroidManifest-common.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,8 +43,8 @@
		<uses-permission android:name="android.permission.VIBRATE"/>
		<!-- for rotating surface by arbitrary degree -->
		<uses-permission android:name="android.permission.ROTATE_SURFACE_FLINGER" />
		<uses-permission android:name="android.permission.WAKEUP_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

OWNERS

+2 −24

Original line number	Diff line number	Diff line
		@@ -5,36 +5,14 @@
		#

		adamcohen@google.com
		alexchau@google.com
		andonian@google.com
		awickham@google.com
		brdayauon@google.com
		brianji@google.com
		captaincole@google.com
		charlander@google.com
		fbaron@google.com
		ganjam@google.com
		hwwang@google.com
		hyunyoungs@google.com
		jagrutdesai@google.com
		jeremysim@google.com
		jiuyu@google.com
		jonmiranda@google.com
		kylim@google.com
		patmanning@google.com
		peanutbutter@google.com
		pinyaoting@google.com
		randypfohl@google.com
		saumyaprakash@google.com
		sihua@google.com
		sunnygoyal@google.com
		tracyzhou@google.com
		tsuharesu@google.com
		twickham@google.com
		vadimt@google.com
		victortulias@google.com
		winsonc@google.com
		xuqiu@google.com
		jonmiranda@google.com
		alexchau@google.com

		per-file FeatureFlags.java, globs = set noparent
		per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.com

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

+1 −57

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.launcher3.testing;

		import static com.android.launcher3.testing.shared.TestProtocol.VIEW_AND_ACTIVITY_LEAKS;
		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
		import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;

		@@ -25,10 +24,8 @@ import android.app.Application;
		import android.content.Context;
		import android.os.Binder;
		import android.os.Bundle;
		import android.os.Process;
		import android.system.Os;
		import android.util.Log;
		import android.view.View;

		import androidx.annotation.Keep;
		import androidx.annotation.Nullable;
		@@ -42,7 +39,6 @@ import com.android.launcher3.testing.shared.TestProtocol;
		import java.util.ArrayList;
		import java.util.Collection;
		import java.util.Collections;
		import java.util.LinkedList;
		import java.util.Map;
		import java.util.WeakHashMap;
		import java.util.concurrent.CountDownLatch;
		@@ -52,7 +48,6 @@ import java.util.concurrent.TimeUnit;
		* Class to handle requests from tests, including debug ones.
		*/
		public class DebugTestInformationHandler extends TestInformationHandler {
		private static LinkedList sLeaks;
		private static Collection<String> sEvents;
		private static Application.ActivityLifecycleCallbacks sActivityLifecycleCallbacks;
		private static final Map<Activity, Boolean> sActivities =
		@@ -67,6 +62,7 @@ public class DebugTestInformationHandler extends TestInformationHandler {
		public void onActivityCreated(Activity activity, Bundle bundle) {
		sActivities.put(activity, true);
		++sActivitiesCreatedCount;
		Log.d(TestProtocol.FLAKY_ACTIVITY_COUNT, "onActivityCreated", new Exception());
		}

		@Override
		@@ -158,19 +154,6 @@ public class DebugTestInformationHandler extends TestInformationHandler {
		return response;
		}

		case TestProtocol.REQUEST_VIEW_LEAK: {
		if (sLeaks == null) sLeaks = new LinkedList();
		Log.d(VIEW_AND_ACTIVITY_LEAKS, "forcefully leaking 2 views");
		sLeaks.add(new View(mContext));
		sLeaks.add(new View(mContext));
		return response;
		}

		case TestProtocol.PRINT_VIEW_LEAK: {
		Log.d(VIEW_AND_ACTIVITY_LEAKS, "(pid=" + Process.myPid() + ") sLeaks=" + sLeaks);
		return response;
		}

		case TestProtocol.REQUEST_START_EVENT_LOGGING: {
		sEvents = new ArrayList<>();
		TestLogging.setEventConsumer(
		@@ -218,29 +201,6 @@ public class DebugTestInformationHandler extends TestInformationHandler {
		}
		}

		case TestProtocol.REQUEST_USE_TEST_WORKSPACE_LAYOUT: {
		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_TAPL_WORKSPACE_LAYOUT: {
		useTestWorkspaceLayout(
		LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TAPL);
		return response;
		}

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

		case TestProtocol.REQUEST_HOTSEAT_ICON_NAMES: {
		return getLauncherUIProperty(Bundle::putStringArrayList, l -> {
		ShortcutAndWidgetContainer hotseatIconsContainer =
		@@ -278,20 +238,4 @@ public class DebugTestInformationHandler extends TestInformationHandler {
		return super.call(method, arg, extras);
		}
		}

		private void useTestWorkspaceLayout(String layout) {
		final long identity = Binder.clearCallingIdentity();
		try {
		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/res/values-am/strings.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -9,12 +9,12 @@
		<string name="dialog_cancel" msgid="6464336969134856366">"ይቅር"</string>
		<string name="dialog_settings" msgid="6564397136021186148">"ቅንብሮች"</string>
		<string name="niu_actions_confirmation_title" msgid="3863451714863526143">"በማያ ገጹ ላይ ጽሑፍን ይተረጉሙ ወይም ያዳምጡ"</string>
		<string name="niu_actions_confirmation_text" msgid="2105271481950866089">"እንደ በማያ ገፅዎ ላይ ያለ ጽሁፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገፅ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ "<b>"ቅንብሮች > መተግበሪያዎች > ነባሪ መተግበሪያዎች > ዲጂታል ረዳት መተግበሪያ"</b>" ይሂዱ።"</string>
		<string name="niu_actions_confirmation_text" msgid="2105271481950866089">"እንደ በማያ ገጽዎ ላይ ያለ ጽሁፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ "<b>"ቅንብሮች > መተግበሪያዎች > ነባሪ መተግበሪያዎች > ዲጂታል ረዳት መተግበሪያ"</b>" ይሂዱ።"</string>
		<string name="assistant_not_selected_title" msgid="5017072974603345228">"ይህንን ባህሪ ለመጠቀም ረዳት ይምረጡ"</string>
		<string name="assistant_not_selected_text" msgid="3244613673884359276">"በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያን ይምረጡ"</string>
		<string name="assistant_not_supported_title" msgid="1675788067597484142">"ይህንን ባህሪ ለመጠቀም ረዳትዎን ይቀይሩ"</string>
		<string name="assistant_not_supported_text" msgid="1708031078549268884">"በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያዎን ይቀይሩ"</string>
		<string name="tooltip_listen" msgid="7634466447860989102">"በዚህ ማያ ገፅ ላይ ጽሁፍ ለማዳመጥ እዚህ መታ ያድርጉ"</string>
		<string name="tooltip_translate" msgid="4184845868901542567">"በዚህ ማያ ገፅ ላይ ጽሁፍ ለመተርጎም እዚህ መታ ያድርጉ"</string>
		<string name="tooltip_listen" msgid="7634466447860989102">"በዚህ ማያ ገጽ ላይ ጽሁፍ ለማዳመጥ እዚህ መታ ያድርጉ"</string>
		<string name="tooltip_translate" msgid="4184845868901542567">"በዚህ ማያ ገጽ ላይ ጽሁፍ ለመተርጎም እዚህ መታ ያድርጉ"</string>
		<string name="toast_p2p_app_not_shareable" msgid="7229739094132131536">"ይህ መተግበሪያ ሊጋራ አይችልም"</string>
		</resources>