DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I9e4d28eff0945fc4691ca0cb6d2dd1485d2177af
diff --git a/Android.bp b/Android.bp
index 4bdfd32..08c816f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,10 +40,7 @@
privileged: true,
static_libs: [
"LocalMediaPlayer-proto",
- "android-support-car",
- "android-support-v4",
- "android.support.car",
- "android.car",
+ "androidx.legacy_legacy-support-v4",
],
optimize: {
enabled: false,
@@ -51,9 +48,6 @@
dex_preopt: {
enabled: false,
},
- aaptflags: [
- "--auto-add-overlay",
- ],
product_variables: {
pdk: {
enabled: false,
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8a76011..22ece79 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,6 +43,7 @@
<activity
android:name=".PermissionsActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" >
+ <meta-data android:name="distractionOptimized" android:value="true"/>
</activity>
</application>
diff --git a/res/drawable/ic_album.xml b/res/drawable/ic_album.xml
index 84e3ccb..85da362 100644
--- a/res/drawable/ic_album.xml
+++ b/res/drawable/ic_album.xml
@@ -1,4 +1,4 @@
<vector android:height="64dp" android:viewportHeight="48.0"
android:viewportWidth="48.0" android:width="64dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="#000000" android:pathData="M24,4C12.95,4 4,12.95 4,24s8.95,20 20,20 20,-8.95 20,-20S35.05,4 24,4zM24,33c-4.97,0 -9,-4.03 -9,-9s4.03,-9 9,-9 9,4.03 9,9 -4.03,9 -9,9zM24,22c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+ <path android:fillColor="@color/icon_color" android:pathData="M24,4C12.95,4 4,12.95 4,24s8.95,20 20,20 20,-8.95 20,-20S35.05,4 24,4zM24,33c-4.97,0 -9,-4.03 -9,-9s4.03,-9 9,-9 9,4.03 9,9 -4.03,9 -9,9zM24,22c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
</vector>
diff --git a/res/drawable/ic_artist.xml b/res/drawable/ic_artist.xml
index fdcb663..f73af7a 100644
--- a/res/drawable/ic_artist.xml
+++ b/res/drawable/ic_artist.xml
@@ -1,4 +1,4 @@
<vector android:height="64dp" android:viewportHeight="48.0"
android:viewportWidth="48.0" android:width="64dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="#000000" android:pathData="M24,11.8c2.32,0 4.2,1.88 4.2,4.2s-1.88,4.2 -4.2,4.2 -4.2,-1.88 -4.2,-4.2 1.88,-4.2 4.2,-4.2m0,18c5.95,0 12.2,2.91 12.2,4.2v2.2L11.8,36.2L11.8,34c0,-1.29 6.25,-4.2 12.2,-4.2M24,8c-4.42,0 -8,3.58 -8,8 0,4.41 3.58,8 8,8s8,-3.59 8,-8c0,-4.42 -3.58,-8 -8,-8zM24,26c-5.33,0 -16,2.67 -16,8v6h32v-6c0,-5.33 -10.67,-8 -16,-8z"/>
+ <path android:fillColor="@color/icon_color" android:pathData="M24,11.8c2.32,0 4.2,1.88 4.2,4.2s-1.88,4.2 -4.2,4.2 -4.2,-1.88 -4.2,-4.2 1.88,-4.2 4.2,-4.2m0,18c5.95,0 12.2,2.91 12.2,4.2v2.2L11.8,36.2L11.8,34c0,-1.29 6.25,-4.2 12.2,-4.2M24,8c-4.42,0 -8,3.58 -8,8 0,4.41 3.58,8 8,8s8,-3.59 8,-8c0,-4.42 -3.58,-8 -8,-8zM24,26c-5.33,0 -16,2.67 -16,8v6h32v-6c0,-5.33 -10.67,-8 -16,-8z"/>
</vector>
diff --git a/res/drawable/ic_folder.xml b/res/drawable/ic_folder.xml
index 9345347..646cce7 100644
--- a/res/drawable/ic_folder.xml
+++ b/res/drawable/ic_folder.xml
@@ -1,4 +1,4 @@
<vector android:height="64dp" android:viewportHeight="48.0"
android:viewportWidth="48.0" android:width="64dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="#000000" android:pathData="M40,12L24,12l-4,-4L8,8c-2.21,0 -3.98,1.79 -3.98,4L4,36c0,2.21 1.79,4 4,4h32c2.21,0 4,-1.79 4,-4L44,16c0,-2.21 -1.79,-4 -4,-4zM40,36L8,36L8,16h32v20z"/>
+ <path android:fillColor="@color/icon_color" android:pathData="M40,12L24,12l-4,-4L8,8c-2.21,0 -3.98,1.79 -3.98,4L4,36c0,2.21 1.79,4 4,4h32c2.21,0 4,-1.79 4,-4L44,16c0,-2.21 -1.79,-4 -4,-4zM40,36L8,36L8,16h32v20z"/>
</vector>
diff --git a/res/drawable/ic_genre.xml b/res/drawable/ic_genre.xml
index 12c4e90..3c7c268 100644
--- a/res/drawable/ic_genre.xml
+++ b/res/drawable/ic_genre.xml
@@ -1,4 +1,4 @@
<vector android:height="64dp" android:viewportHeight="48.0"
android:viewportWidth="48.0" android:width="64dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="#000000" android:pathData="M24,2C14.06,2 6,10.06 6,20v14c0,3.31 2.69,6 6,6h6V24h-8v-4c0,-7.73 6.27,-14 14,-14s14,6.27 14,14v4h-8v16h6c3.31,0 6,-2.69 6,-6V20c0,-9.94 -8.06,-18 -18,-18z"/>
+ <path android:fillColor="@color/icon_color" android:pathData="M24,2C14.06,2 6,10.06 6,20v14c0,3.31 2.69,6 6,6h6V24h-8v-4c0,-7.73 6.27,-14 14,-14s14,6.27 14,14v4h-8v16h6c3.31,0 6,-2.69 6,-6V20c0,-9.94 -8.06,-18 -18,-18z"/>
</vector>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 49f72d5..6e6bd92 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,8 +15,5 @@
* limitations under the License.
-->
<resources>
- <!-- TODO: These colors were randomly selected by Android Studio. Replace with visd. -->
- <color name="colorPrimary">#3F51B5</color>
- <color name="colorPrimaryDark">#303F9F</color>
- <color name="colorAccent">#FF4081</color>
+ <color name="icon_color">@*android:color/car_tint_light</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5db8915..c8f692b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,9 +17,5 @@
-->
<resources>
<!-- Base application theme. -->
- <style name="LocalMediaPlayerAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
- <item name="colorPrimary">@color/colorPrimary</item>
- <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
- <item name="colorAccent">@color/colorAccent</item>
- </style>
+ <style name="LocalMediaPlayerAppTheme" parent="android:Theme.DeviceDefault.Light.NoActionBar"/>
</resources>
diff --git a/src/com/android/car/media/localmediaplayer/LocalMediaBrowserService.java b/src/com/android/car/media/localmediaplayer/LocalMediaBrowserService.java
index 5b5ae1c..6f3e5fd 100644
--- a/src/com/android/car/media/localmediaplayer/LocalMediaBrowserService.java
+++ b/src/com/android/car/media/localmediaplayer/LocalMediaBrowserService.java
@@ -24,7 +24,7 @@
import android.media.session.MediaSession;
import android.os.Bundle;
import android.service.media.MediaBrowserService;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.Log;
import java.util.ArrayList;
