Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (4588c145) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/battery/BatteryMeterViewController.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static lineageos.providers.LineageSettings.System.STATUS_BAR_SHOW_BATTERY

		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.database.ContentObserver;
		import android.net.Uri;
		import android.os.Handler;
		@@ -34,6 +35,7 @@ import androidx.annotation.NonNull;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.statusbar.phone.StatusBarIconController;
		import com.android.systemui.statusbar.policy.BatteryController;
		@@ -128,7 +130,8 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView>
		@Main Handler mainHandler,
		ContentResolver contentResolver,
		FeatureFlags featureFlags,
		BatteryController batteryController) {
		BatteryController batteryController,
		ActivityStarter activityStarter) {
		super(view);
		mUserTracker = userTracker;
		mConfigurationController = configurationController;
		@@ -139,6 +142,8 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView>

		mView.setBatteryEstimateFetcher(mBatteryController::getEstimatedTimeRemainingString);
		mView.setDisplayShieldEnabled(featureFlags.isEnabled(Flags.BATTERY_SHIELD_ICON));
		mView.setOnClickListener(v -> activityStarter.postStartActivityDismissingKeyguard(
		new Intent(Intent.ACTION_POWER_USAGE_SUMMARY), 0));

		mSlotBattery = getResources().getString(com.android.internal.R.string.status_bar_battery);
		mSettingObserver = new SettingObserver(mMainHandler);

packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt

+17 −1

Original line number	Diff line number	Diff line
		@@ -19,12 +19,14 @@ package com.android.systemui.shade
		import android.annotation.IdRes
		import android.app.StatusBarManager
		import android.content.Context
		import android.content.Intent
		import android.content.res.ColorStateList
		import android.content.res.Configuration
		import android.graphics.Color
		import android.os.Bundle
		import android.os.Trace
		import android.os.Trace.TRACE_TAG_APP
		import android.provider.AlarmClock
		import android.util.Pair
		import android.view.View
		import android.view.WindowInsets
		@@ -43,6 +45,7 @@ import com.android.systemui.demomode.DemoModeController
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.plugins.ActivityStarter
		import com.android.systemui.qs.ChipVisibilityListener
		import com.android.systemui.qs.HeaderPrivacyIconsController
		import com.android.systemui.qs.carrier.QSCarrierGroup
		@@ -95,7 +98,8 @@ class LargeScreenShadeHeaderController @Inject constructor(
		private val featureFlags: FeatureFlags,
		private val qsCarrierGroupControllerBuilder: QSCarrierGroupController.Builder,
		private val combinedShadeHeadersConstraintManager: CombinedShadeHeadersConstraintManager,
		private val demoModeController: DemoModeController
		private val demoModeController: DemoModeController,
		private val activityStarter: ActivityStarter
		) : ViewController<View>(header), Dumpable {

		companion object {
		@@ -294,6 +298,18 @@ class LargeScreenShadeHeaderController @Inject constructor(
		if (combinedHeaders) {
		privacyIconsController.onParentVisible()
		}

		clock.setOnClickListener {
		activityStarter.postStartActivityDismissingKeyguard(
		Intent(AlarmClock.ACTION_SHOW_ALARMS), 0
		)
		}

		batteryIcon.setOnClickListener {
		activityStarter.postStartActivityDismissingKeyguard(
		Intent(Intent.ACTION_POWER_USAGE_SUMMARY), 0
		)
		}
		}

		override fun onViewAttached() {

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarViewModule.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.privacy.OngoingPrivacyChip;
		import com.android.systemui.settings.UserTracker;
		@@ -227,7 +228,8 @@ public abstract class StatusBarViewModule {
		@Main Handler mainHandler,
		ContentResolver contentResolver,
		FeatureFlags featureFlags,
		BatteryController batteryController
		BatteryController batteryController,
		ActivityStarter activityStarter
		) {
		return new BatteryMeterViewController(
		batteryMeterView,
		@@ -237,7 +239,8 @@ public abstract class StatusBarViewModule {
		mainHandler,
		contentResolver,
		featureFlags,
		batteryController);
		batteryController,
		activityStarter);

		}

		@@ -301,7 +304,8 @@ public abstract class StatusBarViewModule {
		OperatorNameViewController.Factory operatorNameViewControllerFactory,
		SecureSettings secureSettings,
		@Main Executor mainExecutor,
		DumpManager dumpManager
		DumpManager dumpManager,
		ActivityStarter activityStarter
		) {
		return new CollapsedStatusBarFragment(statusBarFragmentComponentFactory,
		ongoingCallController,
		@@ -323,7 +327,8 @@ public abstract class StatusBarViewModule {
		operatorNameViewControllerFactory,
		secureSettings,
		mainExecutor,
		dumpManager);
		dumpManager,
		activityStarter);
		}

		/**

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -28,10 +28,12 @@ import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		import android.app.Fragment;
		import android.content.Intent;
		import android.database.ContentObserver;
		import android.os.Bundle;
		import android.os.Parcelable;
		import android.os.UserHandle;
		import android.provider.AlarmClock;
		import android.provider.Settings;
		import android.telephony.SubscriptionManager;
		import android.util.ArrayMap;
		@@ -52,6 +54,7 @@ import com.android.systemui.animation.Interpolators;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.shade.NotificationPanelViewController;
		import com.android.systemui.shade.ShadeExpansionStateManager;
		@@ -138,6 +141,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		private final SecureSettings mSecureSettings;
		private final Executor mMainExecutor;
		private final DumpManager mDumpManager;
		private final ActivityStarter mActivityStarter;
		private ClockController mClockController;
		private boolean mIsClockBlacklisted;

		@@ -204,7 +208,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		OperatorNameViewController.Factory operatorNameViewControllerFactory,
		SecureSettings secureSettings,
		@Main Executor mainExecutor,
		DumpManager dumpManager
		DumpManager dumpManager,
		ActivityStarter activityStarter
		) {
		mStatusBarFragmentComponentFactory = statusBarFragmentComponentFactory;
		mOngoingCallController = ongoingCallController;
		@@ -227,6 +232,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue
		mSecureSettings = secureSettings;
		mMainExecutor = mainExecutor;
		mDumpManager = dumpManager;
		mActivityStarter = activityStarter;
		}

		@Override
		@@ -545,6 +551,9 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue

		private void showClock(boolean animate) {
		animateShow(mClockController.getClock(), animate);
		mClockController.getClock().setOnClickListener(v ->
		mActivityStarter.postStartActivityDismissingKeyguard(
		new Intent(AlarmClock.ACTION_SHOW_ALARMS), 0));
		}

		/** Hides the ongoing call chip. */

packages/SystemUI/tests/src/com/android/systemui/battery/BatteryMeterViewControllerTest.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import androidx.test.filters.SmallTest;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.flags.FakeFeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.settings.UserTracker;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		@@ -64,6 +65,8 @@ public class BatteryMeterViewControllerTest extends SysuiTestCase {
		private FakeFeatureFlags mFeatureFlags;
		@Mock
		private BatteryController mBatteryController;
		@Mock
		private ActivityStarter mActivityStarter;

		private BatteryMeterViewController mController;

		@@ -159,7 +162,8 @@ public class BatteryMeterViewControllerTest extends SysuiTestCase {
		mHandler,
		mContentResolver,
		mFeatureFlags,
		mBatteryController
		mBatteryController,
		mActivityStarter
		);
		}
		}