commit f158bdc1e6224fd90669f22a02950d83531b5a1c
author Roshan Agrawal <roshanagrawal@google.com> Wed Aug 08 23:55:29 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 08 23:55:29 2018 +0000
tree 5942b19678edebeaa8cec65b457ce670e21ac1a5
parent a7f06f8066c389a85a385c1806600027ed8d207c
parent 881d4a0f13d6aacb7036e9f04742eed778e95c69

Merge "Use Car Setup Wizard Support Library theme" into pi-car-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index 85874bb..bddfad3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,6 +36,7 @@
       androidx.preference_preference \
       androidx.legacy_legacy-preference-v14 \
       car-settings-lib \
+      car-setup-wizard-lib \
       setup-wizard-lib-gingerbread-compat \
       SettingsLib
 

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8bf143a..2be6686 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -112,7 +112,7 @@
         </activity>
 
         <activity android:name=".security.SetupWizardScreenLockActivity"
-                  android:theme="@style/Theme.Car.Shared.SetupWizard.NoActionBar"
+                  android:theme="@style/Theme.Car.SetupWizard.NoActionBar.Accent"
                   android:configChanges="orientation|keyboardHidden|screenSize"
                   android:windowSoftInputMode="adjustResize">
             <intent-filter>