summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-10-18 04:08:49 +0000
committerGerrit Code Review <gerrit2@cyanogenmod.teamdouche.net>2010-10-18 04:08:49 +0000
commit3584116ce91a5ed1d0b015d1c36e6a2cc89fa940 (patch)
treec68eefdeb9c8a2292af5fae5bb88591717cbeac5 /services/java/com/android/server
parent93bf54b5439bb6a692b766590ebe6c3ca33a46cd (diff)
parent2d2cdd0287dff37c938fc72384224059d451a652 (diff)
downloadframeworks_base-3584116ce91a5ed1d0b015d1c36e6a2cc89fa940.zip
frameworks_base-3584116ce91a5ed1d0b015d1c36e6a2cc89fa940.tar.gz
frameworks_base-3584116ce91a5ed1d0b015d1c36e6a2cc89fa940.tar.bz2
Merge "Make it so the widget shows as on by default." into froyo
Diffstat (limited to 'services/java/com/android/server')
-rw-r--r--services/java/com/android/server/status/StatusBarService.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java
index 7c99b84..f19aefb 100644
--- a/services/java/com/android/server/status/StatusBarService.java
+++ b/services/java/com/android/server/status/StatusBarService.java
@@ -279,8 +279,6 @@ public class StatusBarService extends IStatusBar.Stub
Drawable expBarNotifTitleDrawable;
- private WifiManager mWifiManager = null;
- private BluetoothAdapter mBluetoothAdapter = null;
// for disabling the status bar
ArrayList<DisableRecord> mDisableRecords = new ArrayList<DisableRecord>();
int mDisabled = 0;
@@ -437,8 +435,6 @@ public class StatusBarService extends IStatusBar.Stub
lp.windowAnimations = R.style.Animation_StatusBar;
WindowManagerImpl.getDefault().addView(view, lp);
- mWifiManager = (WifiManager)mContext.getSystemService(Context.WIFI_SERVICE);
- mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
setupPowerWidget();
}
@@ -2368,7 +2364,7 @@ public class StatusBarService extends IStatusBar.Stub
}
boolean powerWidget = Settings.System.getInt(mContext.getContentResolver(),
- Settings.System.EXPANDED_VIEW_WIDGET, 0) == 1;
+ Settings.System.EXPANDED_VIEW_WIDGET, 1) == 1;
if(!powerWidget) {
mExpandedView.findViewById(R.id.exp_power_stat).
setVisibility(View.GONE);