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

Merge "[WifiSetup] Don't show menu during setup"

Browse Source
This commit is contained in:
Maurice Lam
2015-01-21 21:26:10 +00:00
committed by Android (Google) Code Review
parent b992adebd3 d9165c06a4
commit c7f8cac5c9
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
View File

@@ -17,17 +17,14 @@
package com.android.settings.wifi; package com.android.settings.wifi;
import android.content.Intent; import android.content.Intent;
import android.content.res.TypedArray;
import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AbsListView.LayoutParams;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
@@ -35,9 +32,9 @@ import com.android.settings.R;
/** /**
* This customized version of WifiSettings is shown to the user only during Setup Wizard. Menu * This customized version of WifiSettings is shown to the user only during Setup Wizard. Menu
* selections are limited, clicking on an access point will auto-advance to the next screen (once * is not shown, clicking on an access point will auto-advance to the next screen (once connected),
* connected), and, if the user opts to skip ahead without a wifi connection, a warning message * and, if the user opts to skip ahead without a wifi connection, a warning message alerts of
* alerts of possible carrier data charges or missing software updates. * possible carrier data charges or missing software updates.
*/ */
public class WifiSettingsForSetupWizard extends WifiSettings { public class WifiSettingsForSetupWizard extends WifiSettings {
@@ -115,18 +112,8 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
} }
@Override @Override
/* package */ void addOptionsMenuItems(Menu menu) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
final boolean wifiIsEnabled = mWifiManager.isWifiEnabled(); // Do not show menu during setup wizard
final TypedArray ta = getActivity().getTheme()
.obtainStyledAttributes(new int[] {R.attr.ic_wps});
menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
.setIcon(ta.getDrawable(0))
.setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
.setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
ta.recycle();
} }
@Override @Override