commit 7db3e37b5ca325fe56107ca84ffa4b78d6b5f800
author Brian Attwell <brianattwell@google.com> Thu May 21 22:30:33 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 21 22:30:33 2015 +0000
tree 96fcc47b2e116cc278ce50852228009c1213f046
parent 7c2bdd1dae3e535bd300fc30fdf34b62f257652c
parent ec0e096b3165c09f74b5c7cfe391a52e41a42fec

am ec0e096b: Fix button colors in alert dialogs

* commit 'ec0e096b3165c09f74b5c7cfe391a52e41a42fec':
  Fix button colors in alert dialogs

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0cf4de4..8fce0f1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -219,6 +219,7 @@
         <item name="android:textColorPrimary">@color/primary_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_text_color</item>
         <item name="android:listViewStyle">@style/ListViewStyle</item>
+        <item name="android:colorAccent">@color/primary_color</item>
     </style>
 
     <style name="SectionDivider">

src/com/android/contacts/datepicker/DatePickerDialog.java

diff --git a/src/com/android/contacts/datepicker/DatePickerDialog.java b/src/com/android/contacts/datepicker/DatePickerDialog.java
index 2b470d5..1ae1e61 100644
--- a/src/com/android/contacts/datepicker/DatePickerDialog.java
+++ b/src/com/android/contacts/datepicker/DatePickerDialog.java
@@ -105,7 +105,8 @@
             int monthOfYear,
             int dayOfMonth,
             boolean yearOptional) {
-        this(context, THEME_DEVICE_DEFAULT_LIGHT, callBack, year, monthOfYear, dayOfMonth,
+        // Don't pass a theme id. Instead use the default alert dialog theme.
+        this(context, /* themeId = */ -1, callBack, year, monthOfYear, dayOfMonth,
                 yearOptional);
     }