commit e9ac65741189665ebc8d240f495be0ec2bb1a291
author android-build-team Robot <android-build-team-robot@google.com> Sat Mar 23 23:07:56 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Mar 23 23:07:56 2019 +0000
tree c59fab34c86975d99b950671544568c53f269a2c
parent 40897de903271eefa426d00f63a82c59d3b126d6
parent 2a90755219915b788dd82aadfc414f6be80926f7

Snap for 5401728 from 2a90755219915b788dd82aadfc414f6be80926f7 to qt-release

Change-Id: I92efbee4a8d43d358f43072fbfcf6c6d42173a0b

Android.mk

diff --git a/Android.mk b/Android.mk
index 4a5d96c..62bff31 100644
--- a/Android.mk
+++ b/Android.mk
@@ -50,7 +50,6 @@
         LocalMediaPlayer-proto
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-        androidx.car_car \
         androidx.legacy_legacy-support-v4
 
 LOCAL_USE_AAPT2 := true

res/values/colors.xml

diff --git a/res/values/colors.xml b/res/values/colors.xml
index b693f60..6e6bd92 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,5 +15,5 @@
  * limitations under the License.
 -->
 <resources>
-    <color name="icon_color">@color/car_tint_light</color>
+    <color name="icon_color">@*android:color/car_tint_light</color>
 </resources>

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 01af4eb..c8f692b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,5 +17,5 @@
 -->
 <resources>
     <!-- Base application theme. -->
-    <style name="LocalMediaPlayerAppTheme" parent="Theme.AppCompat.Light.NoActionBar"/>
+    <style name="LocalMediaPlayerAppTheme" parent="android:Theme.DeviceDefault.Light.NoActionBar"/>
 </resources>