OSDN Git Service

Merge "Fix search icon theme" into lmp-preview-dev
authorAlan Viverette <alanv@google.com>
Wed, 4 Jun 2014 01:17:36 +0000 (01:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 Jun 2014 01:17:36 +0000 (01:17 +0000)
1  2 
res/values/themes.xml

      </style>
  
      <style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">
-         <item name="android:actionBarWidgetTheme">@android:style/ThemeOverlay.Quantum.ActionBarWidget</item>
-         <item name="android:actionBarTheme">@android:style/ThemeOverlay.Quantum.Dark</item>
+         <item name="android:actionBarWidgetTheme">@null</item>
+         <item name="android:actionBarTheme">@android:style/ThemeOverlay.Quantum.Dark.ActionBar</item>
      </style>
  
 +    <style name="Theme.AlertDialog" parent="@*android:style/Theme.Quantum.Light.Dialog.Alert">
 +        <item name="android:windowSoftInputMode">adjustResize</item>
 +
 +        <item name="android:colorPrimary">@color/actionbar_background_color</item>
 +        <!-- Used by the StatusBar and NavBar -->
 +        <item name="android:colorPrimaryDark">@color/actionbar_background_color</item>
 +        <!-- Redefine control activited color for progress bars and the like -->
 +        <item name="android:colorAccent">@color/quantum_accent_color_light</item>
 +        <!-- Redefine the ActionBar style for contentInsetStart -->
 +        <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
 +    </style>
 +
  </resources>