diff options
author | Jisha Abubaker <jishaa@google.com> | 2018-09-26 16:05:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-26 16:05:45 +0000 |
commit | 250596f58b7292ab4a27400127cd5bcf73581861 (patch) | |
tree | bfa3b6d8ec318d049820b26c722cdc87de1690b9 /input | |
parent | f74de0e61e9b9f0bf13a5b0e2860e7fbdb5307be (diff) | |
parent | 498f6078ef2b0e8d417ee9153386a7a01f424543 (diff) | |
download | android-250596f58b7292ab4a27400127cd5bcf73581861.tar.gz |
Merge "Support Dark Mode on Autofill samples:" into pi-dev
Diffstat (limited to 'input')
4 files changed, 6 insertions, 6 deletions
diff --git a/input/autofill/AutofillFramework/Application/src/main/AndroidManifest.xml b/input/autofill/AutofillFramework/Application/src/main/AndroidManifest.xml index 1fe0b1e4..624eaee1 100644 --- a/input/autofill/AutofillFramework/Application/src/main/AndroidManifest.xml +++ b/input/autofill/AutofillFramework/Application/src/main/AndroidManifest.xml @@ -25,7 +25,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/Theme.AppCompat.Light"> + android:theme="@style/AppTheme"> <activity android:name="com.example.android.autofill.app.MainActivity" android:taskAffinity=".MainActivity"> diff --git a/input/autofill/AutofillFramework/Application/src/main/res/values/styles.xml b/input/autofill/AutofillFramework/Application/src/main/res/values/styles.xml index 39e5ba88..303a44dc 100644 --- a/input/autofill/AutofillFramework/Application/src/main/res/values/styles.xml +++ b/input/autofill/AutofillFramework/Application/src/main/res/values/styles.xml @@ -15,6 +15,10 @@ --> <resources> + <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar"> + <!-- Customize your theme here. --> + </style> + <style name="CustomDatePickerDialogTheme" parent="android:Theme.Material.Light.Dialog"> <item name="android:datePickerStyle">@style/MyDatePickerStyle</item> </style> diff --git a/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_list_item.xml b/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_list_item.xml index 442d54e7..a988d671 100644 --- a/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_list_item.xml +++ b/input/autofill/AutofillFramework/afservice/src/main/res/layout/multidataset_service_list_item.xml @@ -16,7 +16,6 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/white" android:orientation="horizontal"> <TextView diff --git a/input/autofill/AutofillFramework/afservice/src/main/res/values/styles.xml b/input/autofill/AutofillFramework/afservice/src/main/res/values/styles.xml index a7e7bf2f..c15a7397 100644 --- a/input/autofill/AutofillFramework/afservice/src/main/res/values/styles.xml +++ b/input/autofill/AutofillFramework/afservice/src/main/res/values/styles.xml @@ -16,11 +16,8 @@ <resources> <!-- Base application theme. --> - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar"> <!-- Customize your theme here. --> - <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimaryDark</item> - <item name="colorAccent">@color/colorAccent</item> </style> <style name="Settings.Label" parent="@style/TextAppearance.AppCompat.Body1"> |