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

Commit 2efc6aae authored by Marc K's avatar Marc K Committed by LuK1337
Browse files

SystemUI: Make battery & clock clickable again in QuickStatusBarHeader

Change-Id: I944b1122739754cc704f65039319fb260fcdbf1d
parent 3367784f
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -18,10 +18,12 @@ import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;

import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.Rect;
import android.provider.AlarmClock;
import android.util.AttributeSet;
import android.util.Pair;
import android.view.DisplayCutout;
@@ -39,6 +41,7 @@ import com.android.settingslib.Utils;
import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.battery.BatteryMeterView;
import com.android.systemui.plugins.ActivityStarter;
import com.android.systemui.qs.QSDetail.Callback;
import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider;
import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -64,6 +67,8 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu
    private TouchAnimator mIconsAlphaAnimator;
    private TouchAnimator mIconsAlphaAnimatorFixed;

    private final ActivityStarter mActivityStarter;

    protected QuickQSPanel mHeaderQsPanel;
    private View mDatePrivacyView;
    private View mDateView;
@@ -110,6 +115,7 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu

    public QuickStatusBarHeader(Context context, AttributeSet attrs) {
        super(context, attrs);
        mActivityStarter = Dependency.get(ActivityStarter.class);
    }

    /**
@@ -142,9 +148,15 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu

        mClockContainer = findViewById(R.id.clock_container);
        mClockView = findViewById(R.id.clock);
        mClockView.setOnClickListener(
                v -> mActivityStarter.postStartActivityDismissingKeyguard(
                        new Intent(AlarmClock.ACTION_SHOW_ALARMS), 0));
        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();