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

Merge "Fix bug #14323392 Old Settings screen is shown while choosing Settings shortcut"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-05-21 02:25:34 +00:00
committed by Android (Google) Code Review
parent 7c67b677cf 181b98032d
commit 645b709de8
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/styles.xml
View File

@@ -86,9 +86,6 @@
<item name="android:windowContentOverlay">@null</item> <item name="android:windowContentOverlay">@null</item>
</style> </style>
<style name="Theme.CreateShortCut" parent="android:Theme.Quantum.Light.DialogWhenLarge">
</style>
<style name="PreferenceHeaderPanelSinglePane"> <style name="PreferenceHeaderPanelSinglePane">
<item name="android:layout_marginStart">0dp</item> <item name="android:layout_marginStart">0dp</item>
<item name="android:layout_marginEnd">0dp</item> <item name="android:layout_marginEnd">0dp</item>

12
res/values/themes.xml
View File

@@ -59,6 +59,18 @@
<item name="wifi_signal">@drawable/wifi_signal_light</item> <item name="wifi_signal">@drawable/wifi_signal_light</item>
</style> </style>
<style name="Theme.CreateShortCut" parent="android:Theme.Quantum.Light.DialogWhenLarge">
<item name="android:actionBarWidgetTheme">@android:style/ThemeOverlay.Quantum.ActionBarWidget</item>
<item name="android:actionBarTheme">@android:style/ThemeOverlay.Quantum.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>
</style>
<style name="Theme.Settings" parent="@android:style/Theme.Quantum.Light.DarkActionBar"> <style name="Theme.Settings" parent="@android:style/Theme.Quantum.Light.DarkActionBar">
<item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item> <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
<item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item> <item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>