Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75a8e54a authored by Michael W's avatar Michael W Committed by Łukasz Patron
Browse files

fixup! SystemUI: Make clock & battery clickable again^2 

The change made "no-qs" battery and clock also clickable, preventing
swipe-down and double-tap to sleep

Change-Id: I7180bd48dc2fecc6929c85aac94042597d61ebab
parent 73eed5f2

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

+1 −5
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 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;
@@ -130,8 +129,7 @@ public class BatteryMeterViewController extends ViewController<BatteryMeterView> 
            @Main Handler mainHandler,

            ContentResolver contentResolver,

            FeatureFlags featureFlags,

            BatteryController batteryController,

            ActivityStarter activityStarter) {

            BatteryController batteryController) {

        super(view);

        mUserTracker = userTracker;

        mConfigurationController = configurationController;
@@ -142,8 +140,6 @@ 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/statusbar/phone/dagger/StatusBarViewModule.java

+4 −8
Original line number Diff line number Diff line
@@ -228,8 +228,7 @@ public abstract class StatusBarViewModule { 
            @Main Handler mainHandler,

            ContentResolver contentResolver,

            FeatureFlags featureFlags,

            BatteryController batteryController,

            ActivityStarter activityStarter

            BatteryController batteryController

    ) {

        return new BatteryMeterViewController(

                batteryMeterView,
@@ -239,8 +238,7 @@ public abstract class StatusBarViewModule { 
                mainHandler,

                contentResolver,

                featureFlags,

                batteryController,

                activityStarter);

                batteryController);



    }
@@ -304,8 +302,7 @@ public abstract class StatusBarViewModule { 
            OperatorNameViewController.Factory operatorNameViewControllerFactory,

            SecureSettings secureSettings,

            @Main Executor mainExecutor,

            DumpManager dumpManager,

            ActivityStarter activityStarter

            DumpManager dumpManager

    ) {

        return new CollapsedStatusBarFragment(statusBarFragmentComponentFactory,

                ongoingCallController,
@@ -327,8 +324,7 @@ public abstract class StatusBarViewModule { 
                operatorNameViewControllerFactory,

                secureSettings,

                mainExecutor,

                dumpManager,

                activityStarter);

                dumpManager);

    }



    /**

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

+1 −8
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 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;
@@ -141,7 +140,6 @@ 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;
@@ -208,8 +206,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
            OperatorNameViewController.Factory operatorNameViewControllerFactory,

            SecureSettings secureSettings,

            @Main Executor mainExecutor,

            DumpManager dumpManager,

            ActivityStarter activityStarter

            DumpManager dumpManager

    ) {

        mStatusBarFragmentComponentFactory = statusBarFragmentComponentFactory;

        mOngoingCallController = ongoingCallController;
@@ -232,7 +229,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        mSecureSettings = secureSettings;

        mMainExecutor = mainExecutor;

        mDumpManager = dumpManager;

        mActivityStarter = activityStarter;

    }



    @Override
@@ -551,9 +547,6 @@ 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

+1 −5
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 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;
@@ -65,8 +64,6 @@ public class BatteryMeterViewControllerTest extends SysuiTestCase { 
    private FakeFeatureFlags mFeatureFlags;

    @Mock

    private BatteryController mBatteryController;

    @Mock

    private ActivityStarter mActivityStarter;



    private BatteryMeterViewController mController;
@@ -162,8 +159,7 @@ public class BatteryMeterViewControllerTest extends SysuiTestCase { 
                mHandler,

                mContentResolver,

                mFeatureFlags,

                mBatteryController,

                mActivityStarter

                mBatteryController

        );

    }

}

packages/SystemUI/tests/src/com/android/systemui/shade/LargeScreenShadeHeaderControllerCombinedTest.kt

+4 −1
Original line number Diff line number Diff line
@@ -40,6 +40,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
@@ -143,6 +144,7 @@ class LargeScreenShadeHeaderControllerCombinedTest : SysuiTestCase() { 
    @Mock

    private lateinit var largeScreenConstraints: ConstraintSet

    @Mock private lateinit var demoModeController: DemoModeController

    @Mock private lateinit var activityStarter: ActivityStarter



    @JvmField @Rule

    val mockitoRule = MockitoJUnit.rule()
@@ -204,7 +206,8 @@ class LargeScreenShadeHeaderControllerCombinedTest : SysuiTestCase() { 
            featureFlags,

            qsCarrierGroupControllerBuilder,

            combinedShadeHeadersConstraintManager,

            demoModeController

            demoModeController,

            activityStarter

        )

        whenever(view.isAttachedToWindow).thenReturn(true)

        controller.init()