Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 (88cd5025) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6198,6 +6198,12 @@
	<string name="battery_tip_limited_temporarily_title">Charging temporarily limited</string>		<string name="battery_tip_limited_temporarily_title">Charging temporarily limited</string>
	<!-- Summary for the battery limited temporarily tip [CHAR LIMIT=NONE] -->		<!-- Summary for the battery limited temporarily tip [CHAR LIMIT=NONE] -->
	<string name="battery_tip_limited_temporarily_summary">To preserve your battery. Learn more.</string>		<string name="battery_tip_limited_temporarily_summary">To preserve your battery. Learn more.</string>
			<!-- Text of battery limited temporarily tip resume charge button. [CHAR LIMIT=NONE] -->
			<string name="battery_tip_limited_temporarily_dialog_resume_charge">Resume charging</string>
			<!-- Message of battery limited temporarily tip. [CHAR LIMIT=NONE] -->
			<string name="battery_tip_limited_temporarily_dialog_msg" product="default">In certain conditions, like high temperatures and long charging periods, charging may be limited to <xliff:g id="percent" example="50%">%1$s</xliff:g> to help preserve battery health.\n\nWhen those conditions end, your phone will automatically charge normally.</string>
			<!-- Message of battery limited temporarily tip. [CHAR LIMIT=NONE] -->
			<string name="battery_tip_limited_temporarily_dialog_msg" product="tablet">In certain conditions, like high temperatures and long charging periods, charging may be limited to <xliff:g id="percent" example="50%">%1$s</xliff:g> to help preserve battery health.\n\nWhen those conditions end, your tablet will automatically charge normally.</string>
	<!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->		<!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
	<string name="battery_tip_dialog_message" product="default">Because you’ve used your phone more than usual, your battery may run out sooner than it normally would.\n\nApps using most battery:</string>		<string name="battery_tip_dialog_message" product="default">Because you’ve used your phone more than usual, your battery may run out sooner than it normally would.\n\nApps using most battery:</string>
	<!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->		<!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->

src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -139,6 +139,11 @@ public interface PowerUsageFeatureProvider {
	*/		*/
	boolean isChartGraphSlotsEnabled(Context context);		boolean isChartGraphSlotsEnabled(Context context);

			/**
			* Gets a intent for one time bypass charge limited to resume charging.
			*/
			Intent getResumeChargeIntent();

	/**		/**
	* Returns battery history data with corresponding timestamp key.		* Returns battery history data with corresponding timestamp key.
	*/		*/

src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -166,6 +166,11 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
	return false;		return false;
	}		}

			@Override
			public Intent getResumeChargeIntent() {
			return null;
			}

	@Override		@Override
	public Map<Long, Map<String, BatteryHistEntry>> getBatteryHistory(Context context) {		public Map<Long, Map<String, BatteryHistEntry>> getBatteryHistory(Context context) {
	return null;		return null;

src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java

+34 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,9 @@ import android.app.Dialog;
	import android.app.settings.SettingsEnums;		import android.app.settings.SettingsEnums;
	import android.content.Context;		import android.content.Context;
	import android.content.DialogInterface;		import android.content.DialogInterface;
			import android.content.Intent;
			import android.content.IntentFilter;
			import android.os.BatteryManager;
	import android.os.Bundle;		import android.os.Bundle;
	import android.view.LayoutInflater;		import android.view.LayoutInflater;

	@@ -40,6 +43,7 @@ import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
	import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;		import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
	import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;		import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;

			import java.text.NumberFormat;
	import java.util.List;		import java.util.List;

	/**		/**
	@@ -50,6 +54,7 @@ public class BatteryTipDialogFragment extends InstrumentedDialogFragment impleme

	private static final String ARG_BATTERY_TIP = "battery_tip";		private static final String ARG_BATTERY_TIP = "battery_tip";
	private static final String ARG_METRICS_KEY = "metrics_key";		private static final String ARG_METRICS_KEY = "metrics_key";
			private static final double CHARGE_LIMIT_LEVEL = 0.8f;

	@VisibleForTesting		@VisibleForTesting
	BatteryTip mBatteryTip;		BatteryTip mBatteryTip;
	@@ -138,6 +143,28 @@ public class BatteryTipDialogFragment extends InstrumentedDialogFragment impleme
	.setPositiveButton(R.string.battery_tip_unrestrict_app_dialog_ok, this)		.setPositiveButton(R.string.battery_tip_unrestrict_app_dialog_ok, this)
	.setNegativeButton(R.string.battery_tip_unrestrict_app_dialog_cancel, null)		.setNegativeButton(R.string.battery_tip_unrestrict_app_dialog_cancel, null)
	.create();		.create();
			case BatteryTip.TipType.BATTERY_DEFENDER:
			mMetricsFeatureProvider.action(context,
			SettingsEnums.ACTION_TIP_BATTERY_DEFENDER, mMetricsKey);
			final String percentage =
			NumberFormat.getPercentInstance().format(CHARGE_LIMIT_LEVEL);
			final String message = context.getString(
			R.string.battery_tip_limited_temporarily_dialog_msg, percentage);
			final boolean isPluggedIn = isPluggedIn();
			final AlertDialog.Builder dialogBuilder =
			new AlertDialog.Builder(context)
			.setTitle(R.string.battery_tip_limited_temporarily_title)
			.setMessage(message);
			if (isPluggedIn) {
			dialogBuilder
			.setPositiveButton(
			R.string.battery_tip_limited_temporarily_dialog_resume_charge,
			this)
			.setNegativeButton(R.string.okay, null);
			} else {
			dialogBuilder.setPositiveButton(R.string.okay, null);
			}
			return dialogBuilder.create();
	default:		default:
	throw new IllegalArgumentException("unknown type " + mBatteryTip.getType());		throw new IllegalArgumentException("unknown type " + mBatteryTip.getType());
	}		}
	@@ -163,4 +190,11 @@ public class BatteryTipDialogFragment extends InstrumentedDialogFragment impleme
	lsn.onBatteryTipHandled(mBatteryTip);		lsn.onBatteryTipHandled(mBatteryTip);
	}		}

			private boolean isPluggedIn() {
			final Intent batteryIntent = getContext().registerReceiver(null /* receiver */,
			new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
			return batteryIntent != null && batteryIntent.getIntExtra(
			BatteryManager.EXTRA_PLUGGED, 0) != 0;
			}

	}		}

src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java

+6 −13

Original line number	Original line	Diff line number	Diff line
	@@ -16,12 +16,11 @@

	package com.android.settings.fuelgauge.batterytip.actions;		package com.android.settings.fuelgauge.batterytip.actions;

	import android.app.settings.SettingsEnums;
	import android.content.Intent;		import android.content.Intent;

	import com.android.settings.R;
	import com.android.settings.SettingsActivity;		import com.android.settings.SettingsActivity;
	import com.android.settingslib.HelpUtils;		import com.android.settings.overlay.FeatureFactory;
			import android.os.AsyncTask;

	/**		/**
	* Action to open the Support Center article		* Action to open the Support Center article
	@@ -34,19 +33,13 @@ public class BatteryDefenderAction extends BatteryTipAction {
	mSettingsActivity = settingsActivity;		mSettingsActivity = settingsActivity;
	}		}

	/**
	* Handle the action when user clicks positive button
	*/
	@Override		@Override
	public void handlePositiveAction(int metricsKey) {		public void handlePositiveAction(int metricsKey) {
	mMetricsFeatureProvider.action(mContext,		final Intent intent = FeatureFactory.getFactory(mContext)
	SettingsEnums.ACTION_TIP_BATTERY_DEFENDER, metricsKey);		.getPowerUsageFeatureProvider(mContext).getResumeChargeIntent();
	final Intent intent = HelpUtils.getHelpIntent(
	mContext,
	mContext.getString(R.string.help_url_battery_defender),
	getClass().getName());
	if (intent != null) {		if (intent != null) {
	mSettingsActivity.startActivityForResult(intent, 0);		// Post intent to background thread to avoid UI flaky
			AsyncTask.execute(() -> mContext.sendBroadcast(intent));
	}		}
	}		}
	}		}