[go: nahoru, domu]

Add 2 manifests with uses-sdk tag for copybara.

These 2 manifest should be udpated once the other manifest under
the same folder changes
Update imgs with optimized resource to avoid ImageOptimizer warning
Bug: 193187074
Test: Copybara

Change-Id: Ib751f3af34bb93ae8d40ac70835840610da9eafd
diff --git a/car/app/app-samples/showcase/automotive/src/main/AndroidManifestWithSdkVersion.xml b/car/app/app-samples/showcase/automotive/src/main/AndroidManifestWithSdkVersion.xml
new file mode 100644
index 0000000..53e5dc9
--- /dev/null
+++ b/car/app/app-samples/showcase/automotive/src/main/AndroidManifestWithSdkVersion.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+  This manifest is a copy of AndroidManifest with uses-sdk tag under the same folder,
+  please update this manifest after changing the other AndroidManifest.
+-->
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="androidx.car.app.sample.showcase"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+  <uses-sdk
+      android:minSdkVersion="29"
+      android:targetSdkVersion="29" />
+
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+
+  <!-- For PlaceListMapTemplate -->
+  <uses-permission android:name="androidx.car.app.MAP_TEMPLATES"/>
+
+  <!-- For the navigation demos. -->
+  <uses-permission android:name="androidx.car.app.NAVIGATION_TEMPLATES"/>
+  <uses-permission android:name="androidx.car.app.ACCESS_SURFACE"/>
+
+  <!-- For Access to Car Hardware. -->
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+  <uses-permission android:name="android.car.permission.CAR_MILEAGE"/>
+  <uses-permission android:name="android.car.permission.CAR_SPEED"/>
+  <uses-permission android:name="android.car.permission.CAR_INFO"/>
+  <uses-permission android:name="android.car.permission.CAR_ENERGY"/>
+  <uses-permission android:name="android.car.permission.READ_CAR_DISPLAY_UNITS"/>
+  <uses-permission android:name="android.car.permission.CAR_ENERGY_PORTS"/>
+
+  <!-- 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" />
+
+  <application
+      android:label="@string/app_name"
+      android:icon="@drawable/ic_launcher"
+      android:extractNativeLibs="false">
+
+    <meta-data
+        android:name="com.android.automotive"
+        android:resource="@xml/automotive_app_desc"
+        tools:ignore="MetadataTagInsideApplicationTag" />
+
+    <meta-data
+        android:name="androidx.car.app.theme"
+        android:resource="@style/CarAppTheme"
+        tools:ignore="MetadataTagInsideApplicationTag" />
+
+    <meta-data android:name="androidx.car.app.minCarApiLevel"
+        android:value="1"
+        tools:ignore="MetadataTagInsideApplicationTag" />
+
+    <service
+        android:name="androidx.car.app.sample.showcase.common.ShowcaseService"
+        android:exported="true">
+      <intent-filter>
+        <action android:name="androidx.car.app.CarAppService"/>
+        <category android:name="androidx.car.app.category.NAVIGATION"/>
+      </intent-filter>
+    </service>
+
+    <service
+        android:name=".common.navigation.NavigationNotificationService"
+        android:exported="true">
+    </service>
+
+    <provider
+        android:name="androidx.car.app.sample.showcase.common.textandicons.DelayedFileProvider"
+        android:authorities="com.showcase.fileprovider"
+        android:exported="false"
+        android:grantUriPermissions="true">
+      <meta-data
+          android:name="android.support.FILE_PROVIDER_PATHS"
+          android:resource="@xml/file_provider_paths"/>
+    </provider>
+
+    <activity
+        android:name="androidx.car.app.activity.CarAppActivity"
+        android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
+        android:exported="true"
+        android:launchMode="singleTask"
+        android:label="Showcase">
+
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+      <meta-data android:name="distractionOptimized" android:value="true"/>
+    </activity>
+
+    <activity
+        android:name="androidx.car.app.sample.showcase.automotive.DebugActivity"
+        android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
+        android:exported="true"
+        android:launchMode="singleTask"
+        android:label="Showcase - Debug">
+
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+
+  </application>
+</manifest>
diff --git a/car/app/app-samples/showcase/common/src/main/res/drawable-ldpi/banana.png b/car/app/app-samples/showcase/common/src/main/res/drawable-ldpi/banana.png
index 42df8dc..580e274 100644
--- a/car/app/app-samples/showcase/common/src/main/res/drawable-ldpi/banana.png
+++ b/car/app/app-samples/showcase/common/src/main/res/drawable-ldpi/banana.png
Binary files differ
diff --git a/car/app/app-samples/showcase/common/src/main/res/drawable/junction_image.png b/car/app/app-samples/showcase/common/src/main/res/drawable/junction_image.png
index f716cd5..57cbb58 100644
--- a/car/app/app-samples/showcase/common/src/main/res/drawable/junction_image.png
+++ b/car/app/app-samples/showcase/common/src/main/res/drawable/junction_image.png
Binary files differ
diff --git a/car/app/app-samples/showcase/common/src/main/res/drawable/test_image_square.png b/car/app/app-samples/showcase/common/src/main/res/drawable/test_image_square.png
index 2cdf154..31a8d61 100644
--- a/car/app/app-samples/showcase/common/src/main/res/drawable/test_image_square.png
+++ b/car/app/app-samples/showcase/common/src/main/res/drawable/test_image_square.png
Binary files differ
diff --git a/car/app/app-samples/showcase/mobile/src/main/AndroidManifestWithSdkVersion.xml b/car/app/app-samples/showcase/mobile/src/main/AndroidManifestWithSdkVersion.xml
new file mode 100644
index 0000000..9f6d52a
--- /dev/null
+++ b/car/app/app-samples/showcase/mobile/src/main/AndroidManifestWithSdkVersion.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+  This manifest is a copy of AndroidManifest with uses-sdk tag under the same folder,
+  please update this manifest after changing the other AndroidManifest.
+-->
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="androidx.car.app.sample.showcase"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+  <uses-sdk
+      android:minSdkVersion="23"
+      android:targetSdkVersion="29" />
+
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+
+  <!-- For PlaceListMapTemplate -->
+  <uses-permission android:name="androidx.car.app.MAP_TEMPLATES"/>
+
+  <!-- For the navigation demos. -->
+  <uses-permission android:name="androidx.car.app.NAVIGATION_TEMPLATES"/>
+  <uses-permission android:name="androidx.car.app.ACCESS_SURFACE"/>
+
+  <!-- For Access to Car Hardware. -->
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+  <uses-permission android:name="com.google.android.gms.permission.CAR_MILEAGE"/>
+  <uses-permission android:name="com.google.android.gms.permission.CAR_SPEED"/>
+  <uses-permission android:name="com.google.android.gms.permission.CAR_FUEL"/>
+
+  <application
+      android:label="@string/app_name"
+      android:icon="@drawable/ic_launcher"
+      android:extractNativeLibs="false">
+
+    <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.theme"
+        android:resource="@style/CarAppTheme"
+        tools:ignore="MetadataTagInsideApplicationTag" />
+
+    <meta-data android:name="androidx.car.app.minCarApiLevel"
+        android:value="1"
+        tools:ignore="MetadataTagInsideApplicationTag" />
+
+    <service
+        android:name=".common.ShowcaseService"
+        android:exported="true">
+      <intent-filter>
+          <action android:name="androidx.car.app.CarAppService"/>
+          <category android:name="androidx.car.app.category.NAVIGATION"/>
+      </intent-filter>
+    </service>
+
+    <service
+        android:name=".common.navigation.NavigationNotificationService"
+        android:exported="true">
+    </service>
+
+    <provider
+        android:name=".common.textandicons.DelayedFileProvider"
+        android:authorities="com.showcase.fileprovider"
+        android:exported="false"
+        android:grantUriPermissions="true">
+      <meta-data
+          android:name="android.support.FILE_PROVIDER_PATHS"
+          android:resource="@xml/file_provider_paths"/>
+    </provider>
+
+  </application>
+</manifest>