summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ProgressCategory.java
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2010-08-27 10:04:08 -0700
committerDaisuke Miyakawa <dmiyakawa@google.com>2010-09-01 16:17:51 -0700
commitd36699282cbd0a6897f425106081d3f2c0db55d4 (patch)
tree72721ae3dbb67a492e614ec29e7f4182fa99e15a /src/com/android/settings/ProgressCategory.java
parent0b4dc9fd6f31a503e52d6663cc6b3bc9cade4c49 (diff)
downloadpackages_apps_Settings-d36699282cbd0a6897f425106081d3f2c0db55d4.tar.gz
packages_apps_Settings-d36699282cbd0a6897f425106081d3f2c0db55d4.tar.bz2
packages_apps_Settings-d36699282cbd0a6897f425106081d3f2c0db55d4.zip
Add Wifi Setup screen for Setup Wizard with XL size screen.
* Add WifiSettingsForSetupWizardXL as a new Activity The activity has WifiSettings fragment in it. It also contains several buttons, texts around the fragment. * Making configuration UI part of Preference list. In Wifi Setup for Setup Wizard XL, WifiSettings fragment lets a UI for configuring access points shown inside a PregerenceCategory object, while it has been shown as Dialog. To achieve this action, WifiDialog is decomposed into two parts: - WifiConfigUiBase (Mainly UI part) - WifiConfigController (Mainly Wifi controller part) All codes for wifi configuration in WifiDialog is now in WifiConfigController, which is reused from WifiConfigPreference. * Misc stuff - Remove AccessPoint#compareTo(). Instead, AccessPoint.AccessPointComparater should be used when needed. Change-Id: I520d690d3301837d32f91dad54a973a379ce1989
Diffstat (limited to 'src/com/android/settings/ProgressCategory.java')
-rw-r--r--src/com/android/settings/ProgressCategory.java17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java
index f611137a52..e0d9f457d6 100644
--- a/src/com/android/settings/ProgressCategory.java
+++ b/src/com/android/settings/ProgressCategory.java
@@ -21,9 +21,7 @@ import android.preference.PreferenceCategory;
import android.util.AttributeSet;
import android.view.View;
-import java.util.Map;
-
-public class ProgressCategory extends PreferenceCategory {
+public class ProgressCategory extends ProgressCategoryBase {
private boolean mProgress = false;
private View oldView = null;
@@ -36,10 +34,10 @@ public class ProgressCategory extends PreferenceCategory {
@Override
public void onBindView(View view) {
super.onBindView(view);
- View textView = view.findViewById(R.id.scanning_text);
- View progressBar = view.findViewById(R.id.scanning_progress);
+ final View textView = view.findViewById(R.id.scanning_text);
+ final View progressBar = view.findViewById(R.id.scanning_progress);
- int visibility = mProgress ? View.VISIBLE : View.INVISIBLE;
+ final int visibility = mProgress ? View.VISIBLE : View.INVISIBLE;
textView.setVisibility(visibility);
progressBar.setVisibility(visibility);
@@ -50,11 +48,8 @@ public class ProgressCategory extends PreferenceCategory {
}
oldView = view;
}
-
- /**
- * Turn on/off the progress indicator and text on the right.
- * @param progressOn whether or not the progress should be displayed
- */
+
+ @Override
public void setProgress(boolean progressOn) {
mProgress = progressOn;
notifyChanged();