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

Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash

Browse Source 
- fix the way we are passing switchBarMarginStart / switchBarMarginEnd

Change-Id: Ic6e67643be10877a74ae68075460fa5fd4cc5da1
This commit is contained in:
Fabrice Di Meglio
2014-07-15 16:02:09 -07:00
parent 62a8aa7ac9
commit 1b18665dbc
5 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/attrs.xml
View File

@@ -97,6 +97,7 @@
<attr name="keywords" format="string" />
</declare-styleable>
<attr name="switchBarTheme" format="reference" />
<attr name="switchBarMarginStart" format="dimension" />
<attr name="switchBarMarginEnd" format="dimension" />

33
res/values/themes.xml
View File

@@ -32,8 +32,6 @@
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_dark</item>
<item name="setup_divider_color">@color/setup_divider_color_dark</item>
<item name="switchBarMarginStart">0dip</item>
<item name="switchBarMarginEnd">0dip</item>
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
<item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
</style>
@@ -49,8 +47,6 @@
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_light</item>
<item name="setup_divider_color">@color/setup_divider_color_light</item>
<item name="switchBarMarginStart">0dip</item>
<item name="switchBarMarginEnd">0dip</item>
<item name="wifi_signal">@drawable/wifi_signal_light</item>
<item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
</style>
@@ -94,8 +90,8 @@
<item name="@*android:actionBarSize">@dimen/actionbar_size</item>
<item name="switchBarMarginStart">@dimen/switchbar_margin_start</item>
<item name="switchBarMarginEnd">@dimen/switchbar_margin_end</item>
<item name="switchBarTheme">@style/Theme.SwitchBar.Settings</item>
<item name="dashboardBackgroundColor">@color/dashboard_background_color</item>
<!-- Redefine the ActionBar style for contentInsetStart -->
@@ -110,20 +106,29 @@
</style>
<style name="Theme.SubSettings" parent="Theme.Settings">
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
<item name="switchBarTheme">@style/Theme.SwitchBar.SubSettings</item>
</style>
<style name="Theme.ActionBar" parent="@android:style/Widget.Material.Light.ActionBar.Solid">
<item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
</style>
<style name="Theme.SubSettings" parent="Theme.Settings">
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.SubSettingsActionBar</item>
<item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
<item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
<style name="Theme.ActionBar.SubSettings" parent="Theme.ActionBar">
<item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>
</style>
<style name="Theme.SubSettingsActionBar" parent="Theme.ActionBar">
<item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>
<style name="Theme.SwitchBar.Settings" parent="@android:style/Theme.Material">
<item name="switchBarMarginStart">@dimen/switchbar_margin_start</item>
<item name="switchBarMarginEnd">@dimen/switchbar_margin_end</item>
</style>
<style name="Theme.SwitchBar.SubSettings" parent="@android:style/Theme.Material">
<item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
<item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
</style>
<style name="Theme.DialogWhenLarge" parent="@android:style/Theme.Material.Light.DialogWhenLarge">