PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f541710a: Merge "Remove colorPrimaryLight, update to use colorAccent for controls" into lmp-preview-dev

Browse Source 
* commit 'f541710a34576bb75428dc77b3b1c514763a33b3':
  Remove colorPrimaryLight, update to use colorAccent for controls
This commit is contained in:
Alan Viverette
2014-06-04 18:44:40 +00:00
committed by Android Git Automerger
parent 53ac1e2717 f541710a34
commit b763e69742
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/values/themes.xml
View File

@@ -75,15 +75,12 @@
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
<item name="android:colorPrimary">@color/actionbar_background_color</item>
<!-- Used by the bouncing effect for ListView and ScrollView -->
<item name="android:colorPrimaryLight">@color/actionbar_background_color</item>
<!-- Used by the StatusBar and NavBar -->
<item name="android:colorPrimaryDark">@color/actionbar_background_color</item>
<item name="android:colorAccent">@color/quantum_orange_A200</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>
<!-- Redefine control activited color for progress bars and the like -->
<item name="android:colorControlActivated">@color/quantum_accent_color_light</item>
</style>
<style name="Theme.ActionBar" parent="@android:style/Widget.Quantum.Light.ActionBar.Solid">
@@ -92,15 +89,12 @@
<style name="Theme.DialogWhenLarge" parent="android:style/Theme.Quantum.Light.DialogWhenLarge">
<item name="android:colorPrimary">@color/actionbar_background_color</item>
<!-- Used by the bouncing effect for ListView and ScrollView -->
<item name="android:colorPrimaryLight">@color/actionbar_background_color</item>
<!-- Used by the StatusBar and NavBar -->
<item name="android:colorPrimaryDark">@color/actionbar_background_color</item>
<item name="android:colorAccent">@color/quantum_orange_A200</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>
<!-- Redefine control activited color for progress bars and the like -->
<item name="android:colorControlActivated">@color/quantum_accent_color_light</item>
</style>
<style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">