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

Fix overdraw and do some layout optimizations

Browse Source 
- use a specific layout for the Dashboard and for the Preferences
- use a specific background for the Dashboard and for the Preferences

The main idea here is that you cannot have the same layout / background
because the Dashboard is using the "Z elevation" for having its card
"poping up"

Change-Id: I42b7c91efea14315b8a60cf3876938a7f1d1e0b3
This commit is contained in:
Fabrice Di Meglio
2014-07-18 15:20:34 -07:00
parent 3bd0515242
commit d40dd45c18
8 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/attrs.xml
View File

@@ -101,5 +101,5 @@
<attr name="switchBarMarginStart" format="dimension" />
<attr name="switchBarMarginEnd" format="dimension" />
<attr name="dashboardBackgroundColor" format="color" />
<attr name="preferenceBackgroundColor" format="color" />
</resources>

2
res/values/colors.xml
View File

@@ -60,6 +60,6 @@
<color name="switch_accent_color">#ff7fcac3</color>
<color name="default_preference_background_color">@android:color/white</color>
<color name="preference_list_fragment_background_color">@color/default_preference_background_color</color>
<color name="preference_background_color">@color/default_preference_background_color</color>
<color name="search_panel_list_background_color">@color/default_preference_background_color</color>
</resources>

12
res/values/themes.xml
View File

@@ -33,7 +33,7 @@
<item name="ic_wps">@drawable/ic_wps_dark</item>
<item name="setup_divider_color">@color/setup_divider_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
<item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
</style>
<style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
@@ -48,7 +48,7 @@
<item name="ic_wps">@drawable/ic_wps_light</item>
<item name="setup_divider_color">@color/setup_divider_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal_light</item>
<item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
</style>
<style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -92,7 +92,7 @@
<item name="switchBarTheme">@style/Theme.SwitchBar.Settings</item>
<item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>
@@ -142,7 +142,7 @@
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>
<item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
</style>
<style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.Light.NoActionBar">
@@ -156,7 +156,7 @@
<item name="android:actionBarWidgetTheme">@null</item>
<item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>
<item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
</style>
<style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
@@ -177,7 +177,7 @@
<item name="switchBarMarginStart">0dip</item>
<item name="switchBarMarginEnd">0dip</item>
<item name="dashboardBackgroundColor">@android:color/transparent</item>
<item name="preferenceBackgroundColor">@android:color/transparent</item>
</style>
</resources>