Merge "Make the low battery dialog work again." (19536efb) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable-mdpi/battery_low_battery.png

0 → 100644

+3.96 KiB

Loading image diff...

packages/SystemUI/src/com/android/systemui/SystemUIService.java

+14 −3

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ public class SystemUIService extends Service {
		*/
		final Object[] SERVICES = new Object[] {
		R.string.config_statusBarComponent,
		com.android.systemui.power.PowerUI.class,
		};

		/**
		@@ -96,10 +97,20 @@ public class SystemUIService extends Service {
		return;
		}

		if (args == null \|\| args.length == 0) {
		for (SystemUI ui: mServices) {
		pw.println("dumping service: " + ui.getClass().getName());
		ui.dump(fd, pw, args);
		}
		} else {
		String svc = args[0];
		for (SystemUI ui: mServices) {
		String name = ui.getClass().getName();
		if (name.endsWith(svc)) {
		ui.dump(fd, pw, args);
		}
		}
		}
		}
		}

packages/SystemUI/src/com/android/systemui/power/PowerUI.java

0 → 100644

+183 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.power;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.Arrays;

		import android.app.AlertDialog;
		import android.content.BroadcastReceiver;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.net.Uri;
		import android.os.Handler;
		import android.media.AudioManager;
		import android.media.Ringtone;
		import android.media.RingtoneManager;
		import android.provider.Settings;
		import android.util.Slog;
		import android.view.View;
		import android.view.WindowManager;
		import android.widget.TextView;

		import com.android.systemui.R;
		import com.android.systemui.SystemUI;

		public class PowerUI extends SystemUI {
		static final String TAG = "PowerUI";

		Handler mHandler = new Handler();

		AlertDialog mLowBatteryDialog;
		int mBatteryLevel;
		TextView mBatteryLevelTextView;

		public void start() {
		// Register for Intent broadcasts for...
		IntentFilter filter = new IntentFilter();
		filter.addAction(Intent.ACTION_BATTERY_CHANGED);
		filter.addAction(Intent.ACTION_BATTERY_LOW);
		filter.addAction(Intent.ACTION_BATTERY_OKAY);
		filter.addAction(Intent.ACTION_POWER_CONNECTED);
		mContext.registerReceiver(mIntentReceiver, filter, null, mHandler);
		}

		private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		String action = intent.getAction();
		if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
		mBatteryLevel = intent.getIntExtra("level", -1);
		} else if (action.equals(Intent.ACTION_BATTERY_LOW)) {
		showLowBatteryWarning();
		} else if (action.equals(Intent.ACTION_BATTERY_OKAY)
		\|\| action.equals(Intent.ACTION_POWER_CONNECTED)) {
		if (mLowBatteryDialog != null) {
		mLowBatteryDialog.dismiss();
		}
		} else {
		Slog.w(TAG, "unknown intent: " + intent);
		}
		}
		};

		void showLowBatteryWarning() {
		CharSequence levelText = mContext.getString(
		R.string.battery_low_percent_format, mBatteryLevel);

		if (mBatteryLevelTextView != null) {
		mBatteryLevelTextView.setText(levelText);
		} else {
		View v = View.inflate(mContext, R.layout.battery_low, null);
		mBatteryLevelTextView = (TextView)v.findViewById(R.id.level_percent);

		mBatteryLevelTextView.setText(levelText);

		AlertDialog.Builder b = new AlertDialog.Builder(mContext);
		b.setCancelable(true);
		b.setTitle(R.string.battery_low_title);
		b.setView(v);
		b.setIcon(android.R.drawable.ic_dialog_alert);
		b.setPositiveButton(android.R.string.ok, null);

		final Intent intent = new Intent(Intent.ACTION_POWER_USAGE_SUMMARY);
		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
		\| Intent.FLAG_ACTIVITY_MULTIPLE_TASK
		\| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
		\| Intent.FLAG_ACTIVITY_NO_HISTORY);
		if (intent.resolveActivity(mContext.getPackageManager()) != null) {
		b.setNegativeButton(R.string.battery_low_why,
		new DialogInterface.OnClickListener() {
		public void onClick(DialogInterface dialog, int which) {
		mContext.startActivity(intent);
		if (mLowBatteryDialog != null) {
		mLowBatteryDialog.dismiss();
		}
		}
		});
		}

		AlertDialog d = b.create();
		d.setOnDismissListener(mLowBatteryListener);
		d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
		d.show();
		mLowBatteryDialog = d;
		}

		final ContentResolver cr = mContext.getContentResolver();
		if (Settings.System.getInt(cr, Settings.System.POWER_SOUNDS_ENABLED, 1) == 1) {
		final String soundPath = Settings.System.getString(cr,
		Settings.System.LOW_BATTERY_SOUND);
		if (soundPath != null) {
		final Uri soundUri = Uri.parse("file://" + soundPath);
		if (soundUri != null) {
		final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri);
		if (sfx != null) {
		sfx.setStreamType(AudioManager.STREAM_SYSTEM);
		sfx.play();
		}
		}
		}
		}
		}

		private DialogInterface.OnDismissListener mLowBatteryListener
		= new DialogInterface.OnDismissListener() {
		public void onDismiss(DialogInterface dialog) {
		mLowBatteryDialog = null;
		mBatteryLevelTextView = null;
		}
		};


		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		if (false) {
		pw.println("args=" + Arrays.toString(args));
		}
		if (args == null \|\| args.length == 0) {
		pw.print("mLowBatteryDialog=");
		pw.println(mLowBatteryDialog == null ? "null" : mLowBatteryDialog.toString());
		pw.print("mBatteryLevel=");
		pw.println(Integer.toString(mBatteryLevel));
		}

		// DO NOT SUBMIT with this turned on.
		if (false) {
		if (args.length == 3 && "level".equals(args[1])) {
		try {
		final int level = Integer.parseInt(args[2]);
		Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
		intent.putExtra("level", level);
		mIntentReceiver.onReceive(mContext, intent);
		} catch (NumberFormatException ex) {
		pw.println(ex);
		}
		} else if (args.length == 2 && "low".equals(args[1])) {
		Intent intent = new Intent(Intent.ACTION_BATTERY_LOW);
		mIntentReceiver.onReceive(mContext, intent);
		} else if (args.length == 2 && "ok".equals(args[1])) {
		Intent intent = new Intent(Intent.ACTION_BATTERY_OKAY);
		mIntentReceiver.onReceive(mContext, intent);
		}
		}
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

+1 −219

Original line number	Diff line number	Diff line
		@@ -17,14 +17,11 @@
		package com.android.systemui.statusbar.policy;

		import android.app.StatusBarManager;
		import android.app.AlertDialog;
		import android.bluetooth.BluetoothAdapter;
		import android.bluetooth.BluetoothProfile;
		import android.bluetooth.BluetoothPbap;
		import android.content.BroadcastReceiver;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.res.TypedArray;
		@@ -33,8 +30,6 @@ import android.graphics.Typeface;
		import android.graphics.drawable.Drawable;
		import android.location.LocationManager;
		import android.media.AudioManager;
		import android.media.Ringtone;
		import android.media.RingtoneManager;
		import android.net.ConnectivityManager;
		import android.net.NetworkInfo;
		import android.net.Uri;
		@@ -59,11 +54,8 @@ import android.text.SpannableStringBuilder;
		import android.util.Slog;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.WindowManager;
		import android.view.WindowManagerImpl;
		import android.widget.ImageView;
		import android.widget.LinearLayout;
		import android.widget.TextView;

		import com.android.internal.app.IBatteryStats;
		import com.android.internal.telephony.IccCard;
		@@ -95,24 +87,12 @@ public class StatusBarPolicy {

		private final Context mContext;
		private final StatusBarManager mService;
		private final Handler mHandler = new StatusBarHandler();
		private final Handler mHandler = new Handler();
		private final IBatteryStats mBatteryStats;

		// storage
		private StorageManager mStorageManager;

		// battery
		private boolean mBatteryFirst = true;
		private boolean mBatteryPlugged;
		private int mBatteryLevel;
		private AlertDialog mLowBatteryDialog;
		private TextView mBatteryLevelTextView;
		private View mBatteryView;
		private int mBatteryViewSequence;
		private boolean mBatteryShowLowOnEndCall = false;
		private static final boolean SHOW_LOW_BATTERY_WARNING = true;
		private static final boolean SHOW_BATTERY_WARNINGS_IN_CALL = true;

		// phone
		private TelephonyManager mPhone;
		private int mPhoneSignalIconId;
		@@ -357,13 +337,6 @@ public class StatusBarPolicy {
		else if (action.equals(Intent.ACTION_SYNC_STATE_CHANGED)) {
		updateSyncState(intent);
		}
		else if (action.equals(Intent.ACTION_BATTERY_LOW)) {
		onBatteryLow(intent);
		}
		else if (action.equals(Intent.ACTION_BATTERY_OKAY)
		\|\| action.equals(Intent.ACTION_POWER_CONNECTED)) {
		onBatteryOkay(intent);
		}
		else if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED) \|\|
		action.equals(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED)) {
		updateBluetooth(intent);
		@@ -473,9 +446,6 @@ public class StatusBarPolicy {

		// Register for Intent broadcasts for...
		filter.addAction(Intent.ACTION_BATTERY_CHANGED);
		filter.addAction(Intent.ACTION_BATTERY_LOW);
		filter.addAction(Intent.ACTION_BATTERY_OKAY);
		filter.addAction(Intent.ACTION_POWER_CONNECTED);
		filter.addAction(Intent.ACTION_ALARM_CHANGED);
		filter.addAction(Intent.ACTION_SYNC_STATE_CHANGED);
		filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
		@@ -520,179 +490,6 @@ public class StatusBarPolicy {
		final int id = intent.getIntExtra("icon-small", 0);
		int level = intent.getIntExtra("level", 0);
		mService.setIcon("battery", id, level);

		boolean plugged = intent.getIntExtra("plugged", 0) != 0;
		level = intent.getIntExtra("level", -1);
		if (false) {
		Slog.d(TAG, "updateBattery level=" + level
		+ " plugged=" + plugged
		+ " mBatteryPlugged=" + mBatteryPlugged
		+ " mBatteryLevel=" + mBatteryLevel
		+ " mBatteryFirst=" + mBatteryFirst);
		}

		boolean oldPlugged = mBatteryPlugged;

		mBatteryPlugged = plugged;
		mBatteryLevel = level;

		if (mBatteryFirst) {
		mBatteryFirst = false;
		}
		/*
		* No longer showing the battery view because it draws attention away
		* from the USB storage notification. We could still show it when
		* connected to a brick, but that could lead to the user into thinking
		* the device does not charge when plugged into USB (since he/she would
		* not see the same battery screen on USB as he sees on brick).
		*/
		if (false) {
		Slog.d(TAG, "plugged=" + plugged + " oldPlugged=" + oldPlugged + " level=" + level);
		}
		}

		private void onBatteryLow(Intent intent) {
		if (SHOW_LOW_BATTERY_WARNING) {
		if (false) {
		Slog.d(TAG, "mPhoneState=" + mPhoneState
		+ " mLowBatteryDialog=" + mLowBatteryDialog
		+ " mBatteryShowLowOnEndCall=" + mBatteryShowLowOnEndCall);
		}

		if (SHOW_BATTERY_WARNINGS_IN_CALL \|\| mPhoneState == TelephonyManager.CALL_STATE_IDLE) {
		showLowBatteryWarning();
		} else {
		mBatteryShowLowOnEndCall = true;
		}
		}
		}

		private void onBatteryOkay(Intent intent) {
		if (mLowBatteryDialog != null
		&& SHOW_LOW_BATTERY_WARNING) {
		mLowBatteryDialog.dismiss();
		mBatteryShowLowOnEndCall = false;
		}
		}

		private void setBatteryLevel(View parent, int id, int height, int background, int level) {
		ImageView v = (ImageView)parent.findViewById(id);
		LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams)v.getLayoutParams();
		lp.weight = height;
		if (background != 0) {
		v.setBackgroundResource(background);
		Drawable bkg = v.getBackground();
		bkg.setLevel(level);
		}
		}

		private void showLowBatteryWarning() {
		closeLastBatteryView();

		// Show exact battery level.
		CharSequence levelText = mContext.getString(
		R.string.battery_low_percent_format, mBatteryLevel);

		if (mBatteryLevelTextView != null) {
		mBatteryLevelTextView.setText(levelText);
		} else {
		View v = View.inflate(mContext, R.layout.battery_low, null);
		mBatteryLevelTextView=(TextView)v.findViewById(R.id.level_percent);

		mBatteryLevelTextView.setText(levelText);

		AlertDialog.Builder b = new AlertDialog.Builder(mContext);
		b.setCancelable(true);
		b.setTitle(R.string.battery_low_title);
		b.setView(v);
		b.setIcon(android.R.drawable.ic_dialog_alert);
		b.setPositiveButton(android.R.string.ok, null);

		final Intent intent = new Intent(Intent.ACTION_POWER_USAGE_SUMMARY);
		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
		\| Intent.FLAG_ACTIVITY_MULTIPLE_TASK
		\| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
		\| Intent.FLAG_ACTIVITY_NO_HISTORY);
		if (intent.resolveActivity(mContext.getPackageManager()) != null) {
		b.setNegativeButton(R.string.battery_low_why,
		new DialogInterface.OnClickListener() {
		public void onClick(DialogInterface dialog, int which) {
		mContext.startActivity(intent);
		if (mLowBatteryDialog != null) {
		mLowBatteryDialog.dismiss();
		}
		}
		});
		}

		AlertDialog d = b.create();
		d.setOnDismissListener(mLowBatteryListener);
		d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
		d.show();
		mLowBatteryDialog = d;
		}

		final ContentResolver cr = mContext.getContentResolver();
		if (Settings.System.getInt(cr,
		Settings.System.POWER_SOUNDS_ENABLED, 1) == 1)
		{
		final String soundPath = Settings.System.getString(cr,
		Settings.System.LOW_BATTERY_SOUND);
		if (soundPath != null) {
		final Uri soundUri = Uri.parse("file://" + soundPath);
		if (soundUri != null) {
		final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri);
		if (sfx != null) {
		sfx.setStreamType(AudioManager.STREAM_SYSTEM);
		sfx.play();
		}
		}
		}
		}
		}

		private final void updateCallState(int state) {
		mPhoneState = state;
		if (false) {
		Slog.d(TAG, "mPhoneState=" + mPhoneState
		+ " mLowBatteryDialog=" + mLowBatteryDialog
		+ " mBatteryShowLowOnEndCall=" + mBatteryShowLowOnEndCall);
		}
		if (mPhoneState == TelephonyManager.CALL_STATE_IDLE) {
		if (mBatteryShowLowOnEndCall) {
		if (!mBatteryPlugged) {
		showLowBatteryWarning();
		}
		mBatteryShowLowOnEndCall = false;
		}
		} else {
		if (mLowBatteryDialog != null) {
		mLowBatteryDialog.dismiss();
		mBatteryShowLowOnEndCall = true;
		}
		}
		}

		private DialogInterface.OnDismissListener mLowBatteryListener
		= new DialogInterface.OnDismissListener() {
		public void onDismiss(DialogInterface dialog) {
		mLowBatteryDialog = null;
		mBatteryLevelTextView = null;
		}
		};

		private void scheduleCloseBatteryView() {
		Message m = mHandler.obtainMessage(EVENT_BATTERY_CLOSE);
		m.arg1 = (++mBatteryViewSequence);
		mHandler.sendMessageDelayed(m, 3000);
		}

		private void closeLastBatteryView() {
		if (mBatteryView != null) {
		//mBatteryView.debug();
		WindowManagerImpl.getDefault().removeView(mBatteryView);
		mBatteryView = null;
		}
		}

		private void updateConnectivity(Intent intent) {
		@@ -753,7 +550,6 @@ public class StatusBarPolicy {

		@Override
		public void onCallStateChanged(int state, String incomingNumber) {
		updateCallState(state);
		// In cdma, if a voice call is made, RSSI should switch to 1x.
		if (isCdma()) {
		updateSignalStrength();
		@@ -1181,18 +977,4 @@ public class StatusBarPolicy {
		}
		mService.setIcon("phone_signal", mPhoneSignalIconId, 0);
		}


		private class StatusBarHandler extends Handler {
		@Override
		public void handleMessage(Message msg) {
		switch (msg.what) {
		case EVENT_BATTERY_CLOSE:
		if (msg.arg1 == mBatteryViewSequence) {
		closeLastBatteryView();
		}
		break;
		}
		}
		}
		}