Merge Android R

Bug: 168057903
Merged-In: Ifec7170df10167252552ea10ba3eee4fa0f7acd0
Change-Id: I41f9c03860da3e1f8be76e8079d1cfc0d5eac377

1 files changed, 26 insertions, 13 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f084f80..8b26907 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,22 +16,35 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.car.carlauncher"
-          android:sharedUserId="android.uid.system">
-    <!-- System permission to get app usage data -->
-    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+          package="com.android.car.carlauncher">
+
+    <uses-permission android:name="android.car.permission.ACCESS_CAR_PROJECTION_STATUS"/>
+    <!-- System permission to host maps activity -->
+    <uses-permission android:name="android.permission.ACTIVITY_EMBEDDING"/>
     <!-- System permission to send events to hosted maps activity -->
     <uses-permission android:name="android.permission.INJECT_EVENTS"/>
+    <!-- System permission to use internal system windows -->
+    <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW"/>
     <!-- System permissions to bring hosted maps activity to front on main display -->
     <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS"/>
-    <uses-permission android:name="android.permission.REORDER_TASKS"/>
-    <!-- System permission to host maps activity -->
-    <uses-permission android:name="android.permission.ACTIVITY_EMBEDDING"/>
-    <!-- System permission to control media playback of the active session -->
-    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL"/>
     <!-- System permission to query users on device -->
     <uses-permission android:name="android.permission.MANAGE_USERS"/>
-    <uses-permission android:name="android.car.permission.ACCESS_CAR_PROJECTION_STATUS"/>
+    <!-- System permission to control media playback of the active session -->
+    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL"/>
+    <!-- System permission to get app usage data -->
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+    <!-- System permission to query all installed packages -->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.REORDER_TASKS"/>
+
+    <!-- To connect to media browser services in other apps, media browser clients
+    that target Android 11 need to add the following in their manifest -->
+    <queries>
+        <intent>
+            <action android:name="android.media.browse.MediaBrowserService" />
+        </intent>
+    </queries>
+
     <application
         android:icon="@drawable/ic_launcher_home"
         android:label="@string/app_title"
@@ -43,8 +56,7 @@
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"
             android:resumeWhilePausing="true"
-            android:windowSoftInputMode="adjustPan"
-            android:screenOrientation="nosensor">
+            android:windowSoftInputMode="adjustPan">
             <meta-data android:name="distractionOptimized" android:value="true"/>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -56,7 +68,8 @@
             android:name=".AppGridActivity"
             android:launchMode="singleInstance"
             android:exported="true"
-            android:noHistory="true">
+            android:noHistory="true"
+            android:theme="@style/Theme.Launcher.AppGridActivity">
             <meta-data android:name="distractionOptimized" android:value="true"/>
         </activity>
     </application>