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

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

Merge "[WifiSetup] Make dialogs immersive"

parents 482bc382 3f7c09bd

src/com/android/settings/SetupWizardUtils.java

+16 −0
Original line number Diff line number Diff line
@@ -21,17 +21,23 @@ import com.android.setupwizard.navigationbar.SetupWizardNavBar; 




import android.app.Activity;

import android.app.Dialog;

import android.content.Intent;

import android.graphics.Color;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LayerDrawable;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.widget.TextView;



public class SetupWizardUtils {

    private static final String TAG = "SetupWizardUtils";



    public static final int DIALOG_IMMERSIVE_FLAGS = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION

            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;



    // Extra containing the resource name of the theme to be used

    public static final String EXTRA_THEME = "theme";

    public static final String THEME_HOLO = "holo";
@@ -95,6 +101,16 @@ public class SetupWizardUtils { 
        }

    }



    public static void applyImmersiveFlags(final Dialog dialog) {

        applyImmersiveFlags(dialog.getWindow(), DIALOG_IMMERSIVE_FLAGS);

    }



    private static void applyImmersiveFlags(final Window window, final int vis) {

        WindowManager.LayoutParams attrs = window.getAttributes();

        attrs.systemUiVisibility |= vis;

        window.setAttributes(attrs);

    }



    public static TextView getHeader(Activity activity) {

        return (TextView) activity.findViewById(R.id.title);

    }

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

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.wifi;



import android.app.Dialog;

import android.content.Intent;

import android.net.wifi.WifiConfiguration;

import android.os.Bundle;
@@ -29,6 +30,7 @@ import android.widget.ListView; 
import android.widget.TextView;



import com.android.settings.R;

import com.android.settings.SetupWizardUtils;



/**

 * This customized version of WifiSettings is shown to the user only during Setup Wizard. Menu
@@ -118,6 +120,13 @@ public class WifiSettingsForSetupWizard extends WifiSettings { 
        // Do not show menu during setup wizard

    }



    @Override

    public Dialog onCreateDialog(int dialogId) {

        final Dialog dialog = super.onCreateDialog(dialogId);

        SetupWizardUtils.applyImmersiveFlags(dialog);

        return dialog;

    }



    @Override

    protected void connect(final WifiConfiguration config) {

        WifiSetupActivity activity = (WifiSetupActivity) getActivity();

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

+13 −11
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ public class WifiSetupActivity extends WifiPickerActivity 
        @Override

        public Dialog onCreateDialog(Bundle savedInstanceState) {

            int messageRes = getArguments().getInt("messageRes");

            return new AlertDialog.Builder(getActivity())

            final AlertDialog dialog = new AlertDialog.Builder(getActivity())

                    .setMessage(messageRes)

                    .setCancelable(false)

                    .setPositiveButton(R.string.wifi_skip_anyway,
@@ -281,6 +281,8 @@ public class WifiSetupActivity extends WifiPickerActivity 
                                }

                            })

                    .create();

            SetupWizardUtils.applyImmersiveFlags(dialog);

            return dialog;

        }

    }

}