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

Commit 03189712 authored by Danesh Mondegarian's avatar Danesh Mondegarian Committed by DvTonder
Browse files

QuickSettings : Wifi-AP Tile 

Patchset 2 : Cleanup
Patchset 3 : More cleanup and old comment removal
Patchset 4 : Switch to the WifiManager rather than Power Widget
             Better state handling between WiFi AP and WiFi
             WiFi now turns on again if it was on before
Patchset 5 : Revert Power Widget change from Ps1, no longer needed

Change-Id: I5bd59df37ed3094f5ba253a97fd86aa426b98b39
parent 04df05b2

packages/SystemUI/src/com/android/systemui/quicksettings/WifiAPTile.java

0 → 100644
+112 −0
Original line number Diff line number Diff line 
package com.android.systemui.quicksettings;



import android.content.BroadcastReceiver;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.net.wifi.WifiManager;

import android.provider.Settings;

import android.view.LayoutInflater;

import android.view.View;



import com.android.systemui.R;

import com.android.systemui.statusbar.phone.QuickSettingsContainerView;

import com.android.systemui.statusbar.phone.QuickSettingsController;



public class WifiAPTile extends QuickSettingsTile {



    private static WifiManager mWifiManager;



    public WifiAPTile(Context context, LayoutInflater inflater,

            QuickSettingsContainerView container, QuickSettingsController qsc) {

        super(context, inflater, container, qsc);



        mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);



        updateTileState();

        onClick = new View.OnClickListener() {

            @Override

            public void onClick(View v) {

                int state = mWifiManager.getWifiApState();

                switch (state) {

                    case WifiManager.WIFI_AP_STATE_ENABLING:

                    case WifiManager.WIFI_AP_STATE_ENABLED:

                        setSoftapEnabled(false);

                        break;

                    case WifiManager.WIFI_AP_STATE_DISABLING:

                    case WifiManager.WIFI_AP_STATE_DISABLED:

                        setSoftapEnabled(true);

                        break;

                }

            }

        };

        onLongClick = new View.OnLongClickListener() {

            @Override

            public boolean onLongClick(View v) {

                Intent intent = new Intent(Intent.ACTION_MAIN);

                intent.setClassName("com.android.settings", "com.android.settings.TetherSettings");

                startSettingsActivity(intent);

                return true;

            }

        };

        mBroadcastReceiver = new BroadcastReceiver() {

            @Override

            public void onReceive(Context context, Intent intent) {

                 updateTileState();

                 updateQuickSettings();

            }

        };

        mIntentFilter = new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);

    }



    private void updateTileState() {

        int state = mWifiManager.getWifiApState();

        switch (state) {

            case WifiManager.WIFI_AP_STATE_ENABLING:

            case WifiManager.WIFI_AP_STATE_ENABLED:

                mLabel = mContext.getString(R.string.quick_settings_label_enabled);

                mDrawable = R.drawable.ic_qs_wifi_ap_on;

                break;

            case WifiManager.WIFI_AP_STATE_DISABLING:

            case WifiManager.WIFI_AP_STATE_DISABLED:

            default:

                mDrawable = R.drawable.ic_qs_wifi_ap_off;

                mLabel = mContext.getString(R.string.quick_settings_label_disabled);

                break;

        }

    }



    private void setSoftapEnabled(boolean enable) {

        final ContentResolver cr = mContext.getContentResolver();

        /**

         * Disable Wifi if enabling tethering

         */

        int wifiState = mWifiManager.getWifiState();

        if (enable && ((wifiState == WifiManager.WIFI_STATE_ENABLING) ||

                    (wifiState == WifiManager.WIFI_STATE_ENABLED))) {

            mWifiManager.setWifiEnabled(false);

            Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 1);

        }



        // Turn on the Wifi AP

        mWifiManager.setWifiApEnabled(null, enable);



        /**

         *  If needed, restore Wifi on tether disable

         */

        if (!enable) {

            int wifiSavedState = 0;

            try {

                wifiSavedState = Settings.Global.getInt(cr, Settings.Global.WIFI_SAVED_STATE);

            } catch (Settings.SettingNotFoundException e) {

                // Do nothing here

            }

            if (wifiSavedState == 1) {

                mWifiManager.setWifiEnabled(true);

                Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 0);

            }

        }

    }



}

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java

+7 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.systemui.quicksettings.UserTile; 
import com.android.systemui.quicksettings.VibrationModeTile;

import com.android.systemui.quicksettings.WiFiDisplayTile;

import com.android.systemui.quicksettings.WiFiTile;

import com.android.systemui.quicksettings.WifiAPTile;



public class QuickSettingsController {

    private static String TAG = "QuickSettingsController";
@@ -123,6 +124,7 @@ public class QuickSettingsController { 
    public static final int BUG_REPORT_TILE = 17;

    public static final int WIFI_DISPLAY_TILE = 18;

    public static final int FLASHLIGHT_TILE = 19;

    public static final int WIFIAP_TILE = 20;

    public static final int USER_TILE = 99;

    private InputMethodTile IMETile;
@@ -169,7 +171,7 @@ public class QuickSettingsController { 
            } else if (tile.equals(TILE_SYNC)) {

                // Not available yet

            } else if (tile.equals(TILE_WIFIAP)) {

                // Not available yet

                mQuickSettings.add(WIFIAP_TILE);

            } else if (tile.equals(TILE_SCREENTIMEOUT)) {

                // Not available yet

            } else if (tile.equals(TILE_MOBILEDATA)) {
@@ -326,6 +328,10 @@ public class QuickSettingsController { 
                qs = new FlashLightTile(mContext, inflater,

                        (QuickSettingsContainerView) mContainerView, this, mHandler);

                break;

            case WIFIAP_TILE:

                qs = new WifiAPTile(mContext, inflater,

                        (QuickSettingsContainerView) mContainerView, this);

                break;

            }

            if (qs != null) {

                qs.setupQuickSettingsTile();