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

am c988100c: Merge "[WifiSetup] Use adjustResize for alert dialogs during Setup" into mnc-dev

Browse Source 
* commit 'c988100c6e8c2f7eb1fb4133241132b91a987d81':
  [WifiSetup] Use adjustResize for alert dialogs during Setup
This commit is contained in:
Maurice Lam
2015-05-12 18:10:11 +00:00
committed by Android Git Automerger
parent 775cb866ec c988100c6e
commit f51a17e6d2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/themes.xml
View File

@@ -30,6 +30,8 @@
</style> </style>
<style name="SetupWizardTheme" parent="SuwThemeMaterial"> <style name="SetupWizardTheme" parent="SuwThemeMaterial">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item> <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
<item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item> <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item> <item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -50,6 +52,8 @@
</style> </style>
<style name="SetupWizardTheme.Light" parent="SuwThemeMaterial.Light"> <style name="SetupWizardTheme.Light" parent="SuwThemeMaterial.Light">
<!-- For all Alert Dialogs -->
<item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item> <item name="android:listPreferredItemPaddingEnd">@dimen/suw_layout_margin_sides</item>
<item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item> <item name="android:listPreferredItemPaddingStart">@dimen/suw_layout_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item> <item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -160,6 +164,10 @@
<item name="preferenceBackgroundColor">@drawable/preference_background</item> <item name="preferenceBackgroundColor">@drawable/preference_background</item>
</style> </style>
<style name="ThemeOverlay.AlertDialog" parent="@android:style/ThemeOverlay.Material.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item>
</style>
<style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Settings.Dialog.Alert"> <style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
<item name="android:windowSoftInputMode">adjustResize</item> <item name="android:windowSoftInputMode">adjustResize</item>