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

Merge "[WifiSetup] Removed button bar"

Browse Source
This commit is contained in:
Maurice Lam
2014-06-24 19:52:31 +00:00
committed by Android (Google) Code Review
parent 1f6d6a4953 432bd3aab1
commit f13c783f6b
3 changed files with 0 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,6 @@ import android.content.IntentFilter;
import android.content.res.TypedArray;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.util.Log;
@@ -35,7 +33,6 @@ import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.PopupMenu;
import android.widget.PopupMenu.OnMenuItemClickListener;

4
src/com/android/settings/wifi/WifiSetupActivity.java
View File

@@ -45,9 +45,6 @@ public class WifiSetupActivity extends WifiPickerActivity
private static final String EXTRA_ALLOW_SKIP = "allowSkip";
private static final String EXTRA_USE_IMMERSIVE_MODE = "useImmersiveMode";
// this boolean extra shows a custom button that we can control
protected static final String EXTRA_SHOW_CUSTOM_BUTTON = "wifi_show_custom_button";
// Extra containing the resource name of the theme to be used
private static final String EXTRA_THEME = "theme";
private static final String THEME_HOLO = "holo";
@@ -152,7 +149,6 @@ public class WifiSetupActivity extends WifiPickerActivity
getWindow().setNavigationBarColor(Color.TRANSPARENT);
getWindow().setStatusBarColor(Color.TRANSPARENT);
}
getIntent().putExtra(EXTRA_SHOW_CUSTOM_BUTTON, false);
bar.getNextButton().setText(R.string.skip_label);
if (!getIntent().getBooleanExtra(EXTRA_ALLOW_SKIP, true)) {