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

[WifiDialog] Theme for setup wizard

Browse Source 
Use setup wizard themes so that dialogs are shown in the correct
accent colors and dark/light themes.

Bug: 25515641
Change-Id: I87a0a01001944b50e48ec812f071a988f37ed8db
This commit is contained in:
Maurice Lam
2015-11-05 18:51:05 -08:00
parent 157ec2f09a
commit dd3e2434ee
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/values/themes.xml
View File

@@ -85,6 +85,20 @@
<item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item> <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>
</style> </style>
<style name="SetupWizardTheme.Transparent" parent="SetupWizardTheme">
<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="SetupWizardTheme.Light.Transparent" parent="SetupWizardTheme.Light">
<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="PreferenceThemeOverlay.SetupWizard" parent="PreferenceThemeOverlay.v14.Material"> <style name="PreferenceThemeOverlay.SetupWizard" parent="PreferenceThemeOverlay.v14.Material">
<item name="preferenceFragmentStyle">@style/SetupWizardPreferenceFragmentStyle</item> <item name="preferenceFragmentStyle">@style/SetupWizardPreferenceFragmentStyle</item>
</style> </style>

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

@@ -41,6 +41,14 @@ public class SetupWizardUtils {
} }
} }
public static int getTransparentTheme(Intent intent) {
if (WizardManagerHelper.isLightTheme(intent, true)) {
return R.style.SetupWizardTheme_Light_Transparent;
} else {
return R.style.SetupWizardTheme_Transparent;
}
}
/** /**
* Sets the immersive mode related flags based on the extra in the intent which started the * Sets the immersive mode related flags based on the extra in the intent which started the
* activity. * activity.

8
src/com/android/settings/wifi/WifiDialogActivity.java
View File

@@ -25,7 +25,9 @@ import android.net.wifi.WifiManager;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import com.android.settings.SetupWizardUtils;
import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPoint;
import com.android.setupwizardlib.util.WizardManagerHelper;
public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener, public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener,
DialogInterface.OnDismissListener { DialogInterface.OnDismissListener {
@@ -40,9 +42,13 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
final Intent intent = getIntent();
if (WizardManagerHelper.isSetupWizardIntent(intent)) {
setTheme(SetupWizardUtils.getTransparentTheme(intent));
}
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
final Intent intent = getIntent();
final Bundle accessPointState = intent.getBundleExtra(KEY_ACCESS_POINT_STATE); final Bundle accessPointState = intent.getBundleExtra(KEY_ACCESS_POINT_STATE);
AccessPoint accessPoint = null; AccessPoint accessPoint = null;
if (accessPointState != null) { if (accessPointState != null) {