release-request-5b56a53d-a8e3-4705-b74f-5b671f2123c3-for-git_oc-dr1-release-41... (1cb4703e) · Commits · e / os / android_packages_apps_Settings

res/layout/settings_entity_header.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@
		android:gravity="start"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:textAlignment="viewStart"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary" />

+1 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,7 @@ public class InstalledAppDetails extends AppInfoBase

		@Override
		public Loader<BatteryStatsHelper> onCreateLoader(int id, Bundle args) {
		return new BatteryStatsHelperLoader(getContext(), args);
		return new BatteryStatsHelperLoader(getContext());
		}

		@Override

+7 −10

Original line number	Diff line number	Diff line
		@@ -50,11 +50,7 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver {

		@Override
		public void onReceive(Context context, Intent intent) {
		String action = intent.getAction();
		if (mBatteryListener != null && Intent.ACTION_BATTERY_CHANGED.equals(action)
		&& updateBatteryStatus(intent)) {
		mBatteryListener.onBatteryChanged();
		}
		updateBatteryStatus(intent);
		}

		public void setBatteryChangedListener(OnBatteryChangedListener lsn) {
		@@ -62,26 +58,27 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver {
		}

		public void register() {
		mContext.registerReceiver(this,
		final Intent intent = mContext.registerReceiver(this,
		new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
		updateBatteryStatus(intent);
		}

		public void unRegister() {
		mContext.unregisterReceiver(this);
		}

		private boolean updateBatteryStatus(Intent intent) {
		if (intent != null) {
		private void updateBatteryStatus(Intent intent) {
		if (intent != null && mBatteryListener != null && Intent.ACTION_BATTERY_CHANGED.equals(
		intent.getAction())) {
		String batteryLevel = Utils.getBatteryPercentage(intent);
		String batteryStatus = Utils.getBatteryStatus(
		mContext.getResources(), intent);
		if (!batteryLevel.equals(mBatteryLevel) \|\| !batteryStatus.equals(mBatteryStatus)) {
		mBatteryLevel = batteryLevel;
		mBatteryStatus = batteryStatus;
		return true;
		mBatteryListener.onBatteryChanged();
		}
		}
		return false;
		}

		}
		No newline at end of file

+5 −6

Original line number	Diff line number	Diff line
		@@ -31,12 +31,13 @@ import com.android.settings.utils.AsyncLoader;
		public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> {
		@VisibleForTesting
		UserManager mUserManager;
		private Bundle mBundle;
		@VisibleForTesting
		BatteryUtils mBatteryUtils;

		public BatteryStatsHelperLoader(Context context, Bundle bundle) {
		public BatteryStatsHelperLoader(Context context) {
		super(context);
		mBundle = bundle;
		mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
		mBatteryUtils = BatteryUtils.getInstance(context);
		}

		@Override
		@@ -44,9 +45,8 @@ public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> {
		Context context = getContext();
		final BatteryStatsHelper statsHelper = new BatteryStatsHelper(context,
		true /* collectBatteryBroadcast */);
		mBatteryUtils.initBatteryStatsHelper(statsHelper, null /* bundle */, mUserManager);

		BatteryUtils.getInstance(context).initBatteryStatsHelper(statsHelper, mBundle,
		mUserManager);
		return statsHelper;
		}

		@@ -55,5 +55,4 @@ public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> {

		}


		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -370,6 +370,7 @@ public class BatteryUtils {
		public void initBatteryStatsHelper(BatteryStatsHelper statsHelper, Bundle bundle,
		UserManager userManager) {
		statsHelper.create(bundle);
		statsHelper.clearStats();
		statsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, userManager.getUserProfiles());
		}