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

Merge "Add rounded corners to wifi connection dialog"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-12-20 19:05:29 +00:00
committed by Android (Google) Code Review
parent f1da75797e a248b34ce3
commit 769e393709
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/values/themes.xml
View File

@@ -114,6 +114,21 @@
<item name="android:windowAnimationStyle">@null</item> <item name="android:windowAnimationStyle">@null</item>
</style> </style>
<style name="GlifV2Theme.Transparent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="GlifV2Theme.Light.Transparent">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="SuwSuggestionThemeGlif.Light" parent="SuwThemeGlif.Light"> <style name="SuwSuggestionThemeGlif.Light" parent="SuwThemeGlif.Light">
<item name="android:windowAnimationStyle">@android:style/Animation.Activity</item> <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item>
</style> </style>

13
src/com/android/settings/SetupWizardUtils.java
View File

@@ -48,11 +48,16 @@ public class SetupWizardUtils {
} }
public static int getTransparentTheme(Intent intent) { public static int getTransparentTheme(Intent intent) {
if (WizardManagerHelper.isLightTheme(intent, true)) { final int suwTheme = getTheme(intent);
return R.style.SetupWizardTheme_Light_Transparent; int wifiDialogTheme = R.style.GlifV2Theme_Light_Transparent;
} else { if (suwTheme == R.style.GlifV2Theme) {
return R.style.SetupWizardTheme_Transparent; wifiDialogTheme = R.style.GlifV2Theme_Transparent;
} else if (suwTheme == R.style.GlifTheme_Light) {
wifiDialogTheme = R.style.SetupWizardTheme_Light_Transparent;
} else if (suwTheme == R.style.GlifTheme) {
wifiDialogTheme = R.style.SetupWizardTheme_Transparent;
} }
return wifiDialogTheme;
} }
public static void copySetupExtras(Intent fromIntent, Intent toIntent) { public static void copySetupExtras(Intent fromIntent, Intent toIntent) {