SystemUI: Properly set onclick listener for battery (11b0c700) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+17 −3

Original line number	Diff line number	Diff line
		@@ -157,9 +157,6 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
		mDatePrivacySeparator = findViewById(R.id.space);
		// Tint for the battery icons are handled in setupHost()
		mBatteryRemainingIcon = findViewById(R.id.batteryRemainingIcon);
		mBatteryRemainingIcon.setOnClickListener(
		v -> mActivityStarter.postStartActivityDismissingKeyguard(
		new Intent(Intent.ACTION_POWER_USAGE_SUMMARY), 0));

		updateResources();
		Configuration config = mContext.getResources().getConfiguration();
		@@ -404,10 +401,12 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
		// Animates the icons and battery indicator from alpha 0 to 1, when the chip is visible
		mIconsAlphaAnimator = mIconsAlphaAnimatorFixed;
		mIconsAlphaAnimator.setPosition(mKeyguardExpansionFraction);
		setBatteryRemainingOnClick(false);
		} else {
		mIconsAlphaAnimator = null;
		mIconContainer.setAlpha(1);
		mBatteryRemainingIcon.setAlpha(1);
		setBatteryRemainingOnClick(true);
		}

		}
		@@ -568,6 +567,9 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu

		public void updateEverything() {
		post(() -> setClickable(!mExpanded));
		if (mExpanded) {
		setBatteryRemainingOnClick(true);
		}
		}

		public void setCallback(Callback qsPanelCallback) {
		@@ -596,4 +598,16 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
		mClockView.setClockVisibleByUser(!StatusBarIconController.getIconHideList(
		mContext, newValue).contains("clock"));
		}

		private void setBatteryRemainingOnClick(boolean enable) {
		if (enable) {
		mBatteryRemainingIcon.setOnClickListener(
		v -> mActivityStarter.postStartActivityDismissingKeyguard(
		new Intent(Intent.ACTION_POWER_USAGE_SUMMARY), 0));
		mBatteryRemainingIcon.setClickable(true);
		} else {
		mBatteryRemainingIcon.setOnClickListener(null);
		mBatteryRemainingIcon.setClickable(false);
		}
		}
		}