Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5444d955 authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "[WifiDialog] Theme for setup wizard"

parents ee3e51f1 dd3e2434

res/values/themes.xml

+14 −0
Original line number Diff line number Diff line
@@ -85,6 +85,20 @@ 
        <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>

    </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">

        <item name="preferenceFragmentStyle">@style/SetupWizardPreferenceFragmentStyle</item>

    </style>

src/com/android/settings/SetupWizardUtils.java

+8 −0
Original line number Diff line number Diff line
@@ -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

     * activity.

src/com/android/settings/wifi/WifiDialogActivity.java

+7 −1
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ import android.net.wifi.WifiManager; 
import android.os.Bundle;

import android.util.Log;



import com.android.settings.SetupWizardUtils;

import com.android.settingslib.wifi.AccessPoint;

import com.android.setupwizardlib.util.WizardManagerHelper;



public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener,

        DialogInterface.OnDismissListener {
@@ -40,9 +42,13 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo 


    @Override

    protected void onCreate(Bundle savedInstanceState) {

        final Intent intent = getIntent();

        if (WizardManagerHelper.isSetupWizardIntent(intent)) {

            setTheme(SetupWizardUtils.getTransparentTheme(intent));

        }



        super.onCreate(savedInstanceState);



        final Intent intent = getIntent();

        final Bundle accessPointState = intent.getBundleExtra(KEY_ACCESS_POINT_STATE);

        AccessPoint accessPoint = null;

        if (accessPointState != null) {