Merge "Only modify the view of the bar, if we want to." into froyo (3be6795f) · Commits · e / os / android_frameworks_base

services/java/com/android/server/status/StatusBarService.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -2361,8 +2361,7 @@ public class StatusBarService extends IStatusBar.Stub
		}
		} else if (uri.equals(Settings.System.getUriFor(Settings.System.WIDGET_BUTTONS))) {
		setupPowerWidget();
		}

		} else if (uri.equals(Settings.System.getUriFor(Settings.System.EXPANDED_VIEW_WIDGET))) {
		boolean powerWidget = Settings.System.getInt(mContext.getContentResolver(),
		Settings.System.EXPANDED_VIEW_WIDGET, 1) == 1;
		if(!powerWidget) {
		@@ -2372,6 +2371,7 @@ public class StatusBarService extends IStatusBar.Stub
		mExpandedView.findViewById(R.id.exp_power_stat).
		setVisibility(View.VISIBLE);
		}
		}
		updateWidget();
		}
		}