am 43cffa33: am 1a042b55: am 7cd8a7e1: Merge "SysUI: Move... (6c08065a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -745,7 +745,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mHandlerThread.start();

		// Other icons
		mLocationController = new LocationControllerImpl(mContext); // will post a notification
		mLocationController = new LocationControllerImpl(mContext,
		mHandlerThread.getLooper()); // will post a notification
		mBatteryController = new BatteryController(mContext);
		mBatteryController.addStateChangedCallback(new BatteryStateChangeCallback() {
		@Override

packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java

+32 −29

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@ import android.content.Intent;
		import android.content.IntentFilter;
		import android.location.LocationManager;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.Settings;
		@@ -56,31 +58,21 @@ public class LocationControllerImpl extends BroadcastReceiver implements Locatio

		private ArrayList<LocationSettingsChangeCallback> mSettingsChangeCallbacks =
		new ArrayList<LocationSettingsChangeCallback>();
		private final H mHandler = new H();

		public LocationControllerImpl(Context context) {
		public LocationControllerImpl(Context context, Looper bgLooper) {
		mContext = context;

		// Register to listen for changes in location settings.
		IntentFilter filter = new IntentFilter();
		filter.addAction(LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION);
		context.registerReceiverAsUser(this, UserHandle.ALL, filter, null, null);
		filter.addAction(LocationManager.MODE_CHANGED_ACTION);
		context.registerReceiverAsUser(this, UserHandle.ALL, filter, null, new Handler(bgLooper));

		mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
		mStatusBarManager
		= (StatusBarManager) context.getSystemService(Context.STATUS_BAR_SERVICE);

		// Register to listen for changes in location settings.
		IntentFilter intentFilter = new IntentFilter();
		intentFilter.addAction(LocationManager.MODE_CHANGED_ACTION);
		context.registerReceiverAsUser(new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		String action = intent.getAction();
		if (LocationManager.MODE_CHANGED_ACTION.equals(action)) {
		locationSettingsChanged();
		}
		}
		}, UserHandle.ALL, intentFilter, null, new Handler());

		// Examine the current location state and initialize the status view.
		updateActiveLocationRequests();
		refreshViews();
		@@ -91,7 +83,7 @@ public class LocationControllerImpl extends BroadcastReceiver implements Locatio
		*/
		public void addSettingsChangedCallback(LocationSettingsChangeCallback cb) {
		mSettingsChangeCallbacks.add(cb);
		locationSettingsChanged(cb);
		mHandler.sendEmptyMessage(H.MSG_LOCATION_SETTINGS_CHANGED);
		}

		public void removeSettingsChangedCallback(LocationSettingsChangeCallback cb) {
		@@ -181,8 +173,8 @@ public class LocationControllerImpl extends BroadcastReceiver implements Locatio
		// Updates the status view based on the current state of location requests.
		private void refreshViews() {
		if (mAreActiveLocationRequests) {
		mStatusBarManager.setIcon(LOCATION_STATUS_ICON_PLACEHOLDER, LOCATION_STATUS_ICON_ID, 0,
		mContext.getString(R.string.accessibility_location_active));
		mStatusBarManager.setIcon(LOCATION_STATUS_ICON_PLACEHOLDER, LOCATION_STATUS_ICON_ID,
		0, mContext.getString(R.string.accessibility_location_active));
		} else {
		mStatusBarManager.removeIcon(LOCATION_STATUS_ICON_PLACEHOLDER);
		}
		@@ -197,22 +189,33 @@ public class LocationControllerImpl extends BroadcastReceiver implements Locatio
		}
		}

		private void locationSettingsChanged() {
		boolean isEnabled = isLocationEnabled();
		for (LocationSettingsChangeCallback cb : mSettingsChangeCallbacks) {
		cb.onLocationSettingsChanged(isEnabled);
		}
		}

		private void locationSettingsChanged(LocationSettingsChangeCallback cb) {
		cb.onLocationSettingsChanged(isLocationEnabled());
		}

		@Override
		public void onReceive(Context context, Intent intent) {
		final String action = intent.getAction();
		if (LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION.equals(action)) {
		updateActiveLocationRequests();
		} else if (LocationManager.MODE_CHANGED_ACTION.equals(action)) {
		mHandler.sendEmptyMessage(H.MSG_LOCATION_SETTINGS_CHANGED);
		}
		}

		private final class H extends Handler {
		private static final int MSG_LOCATION_SETTINGS_CHANGED = 1;

		@Override
		public void handleMessage(Message msg) {
		switch (msg.what) {
		case MSG_LOCATION_SETTINGS_CHANGED:
		locationSettingsChanged();
		break;
		}
		}

		private void locationSettingsChanged() {
		boolean isEnabled = isLocationEnabled();
		for (LocationSettingsChangeCallback cb : mSettingsChangeCallbacks) {
		cb.onLocationSettingsChanged(isEnabled);
		}
		}
		}
		}