Merge "Correct Nav sample app manifest" into androidx-main

Author: Nits2097

car/app/app-samples/navigation/mobile/src/main/AndroidManifestWithSdkVersion.xml

@@ -37,31 +37,18 @@
     <uses-permission android:name="androidx.car.app.ACCESS_SURFACE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
-    <!-- Various required feature settings for an automotive app. -->
-    <uses-feature
-        android:name="android.hardware.type.automotive"
-        android:required="true" />
-    <uses-feature
-        android:name="android.software.car.templates_host"
-        android:required="true" />
-    <uses-feature
-        android:name="android.hardware.wifi"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.screen.portrait"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.screen.landscape"
-        android:required="false" />
+    <!-- For Microphone Recording -->
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name">
 
-         <meta-data
-             android:name="com.android.automotive"
-             android:resource="@xml/automotive_app_desc"
-             tools:ignore="MetadataTagInsideApplicationTag" />
+        <meta-data
+            android:name="com.google.android.gms.car.application"
+            android:resource="@xml/automotive_app_desc"
+            tools:ignore="MetadataTagInsideApplicationTag" />
 
         <meta-data android:name="androidx.car.app.minCarApiLevel"
             android:value="1"
@@ -77,31 +64,16 @@
                 <category android:name="androidx.car.app.category.NAVIGATION"/>
                 <category android:name="androidx.car.app.category.FEATURE_CLUSTER"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="androidx.car.app.action.NAVIGATE" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:scheme="geo" />
+            </intent-filter>
         </service>
         <service
             android:name="androidx.car.app.sample.navigation.common.nav.NavigationService"
             android:enabled="true"
             android:exported="true">
         </service>
-
-        <activity
-            android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
-            android:name="androidx.car.app.activity.CarAppActivity"
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:label="Navigation">
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="androidx.car.app.action.NAVIGATE" />
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:scheme="geo" />
-            </intent-filter>
-            <meta-data android:name="distractionOptimized" android:value="true"/>
-        </activity>
-
     </application>
 </manifest>