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

Add modifications which should have been in the change

Browse Source 
I520d690d3301837d32f91dad54a973a379ce1989

Change-Id: Iecca6b4fef2ec42a62273035b096ccedcea94d78
This commit is contained in:
Daisuke Miyakawa
2010-09-01 19:27:11 -07:00
parent d36699282c
commit 5cd60eb8aa
11 changed files with 234 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/ProgressCategory.java
View File

@@ -17,7 +17,6 @@
package com.android.settings;
import android.content.Context;
import android.preference.PreferenceCategory;
import android.util.AttributeSet;
import android.view.View;

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

@@ -16,6 +16,8 @@
package com.android.settings.wifi;
import com.android.settings.R;
import android.content.Context;
import android.net.NetworkInfo.DetailedState;
import android.net.wifi.ScanResult;
@@ -27,8 +29,6 @@ import android.preference.Preference;
import android.view.View;
import android.widget.ImageView;
import com.android.settings.R;
import java.util.Comparator;
class AccessPoint extends Preference {

6
src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.wifi;
import android.content.Context;
import android.util.AttributeSet;
import com.android.settings.ProgressCategoryBase;
import com.android.settings.R;
import android.content.Context;
import android.util.AttributeSet;
public class AccessPointCategoryForSetupWizardXL extends ProgressCategoryBase {
public AccessPointCategoryForSetupWizardXL(Context context, AttributeSet attrs) {
super(context, attrs);

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

@@ -16,11 +16,11 @@
package com.android.settings.wifi;
import com.android.settings.R;
import android.content.Context;
import android.net.NetworkInfo.DetailedState;
import com.android.settings.R;
class Summary {
static String get(Context context, String ssid, DetailedState state) {
String[] formats = context.getResources().getStringArray((ssid == null)

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

@@ -16,6 +16,8 @@
package com.android.settings.wifi;
import com.android.settings.R;
import android.content.Context;
import android.content.DialogInterface;
import android.preference.Preference;
@@ -24,8 +26,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import com.android.settings.R;
/**
* Preference letting users modify a setting for Wifi network. This work as an alternative UI
* for {@link WifiDialog} without shouwing popup Dialog.

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

@@ -16,6 +16,8 @@
package com.android.settings.wifi;
import com.android.settings.R;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -23,8 +25,6 @@ import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import com.android.settings.R;
class WifiDialog extends AlertDialog implements WifiConfigUiBase {
static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE;
static final int BUTTON_FORGET = DialogInterface.BUTTON_NEUTRAL;

11
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -16,6 +16,10 @@
package com.android.settings.wifi;
import com.android.settings.ProgressCategoryBase;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -47,17 +51,10 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.Button;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import com.android.settings.ProgressCategoryBase;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import java.util.Collection;
import java.util.List;
import java.util.TreeSet;

5
src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
View File

@@ -16,10 +16,11 @@
package com.android.settings.wifi;
import com.android.settings.R;
import android.app.Activity;
import android.net.NetworkInfo.DetailedState;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.Window;
@@ -27,8 +28,6 @@ import android.widget.Button;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.settings.R;
import java.util.EnumMap;
/**