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

Commit d4911bf8 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-19.1' into v1-s

parents f9b27bad e1f5dc7e

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

+0 −13
Original line number Diff line number Diff line
@@ -18,10 +18,8 @@ package com.android.systemui.qs; 


import android.os.Bundle;



import com.android.internal.colorextraction.ColorExtractor;

import com.android.systemui.R;

import com.android.systemui.battery.BatteryMeterViewController;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.demomode.DemoMode;

import com.android.systemui.demomode.DemoModeController;

import com.android.systemui.flags.FeatureFlags;
@@ -64,9 +62,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 


    private boolean mListening;



    private SysuiColorExtractor mColorExtractor;

    private ColorExtractor.OnColorsChangedListener mOnColorsChangedListener;



    @Inject

    QuickStatusBarHeaderController(QuickStatusBarHeader view,

            HeaderPrivacyIconsController headerPrivacyIconsController,
@@ -74,7 +69,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
            DemoModeController demoModeController,

            QuickQSPanelController quickQSPanelController,

            QSCarrierGroupController.Builder qsCarrierGroupControllerBuilder,

            SysuiColorExtractor colorExtractor,

            QSExpansionPathInterpolator qsExpansionPathInterpolator,

            BatteryMeterViewController batteryMeterViewController,

            FeatureFlags featureFlags,
@@ -104,12 +98,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 


        mIconManager = new StatusBarIconController.TintedIconManager(mIconContainer, featureFlags);

        mDemoModeReceiver = new ClockDemoModeReceiver(mClockView);

        mColorExtractor = colorExtractor;

        mOnColorsChangedListener = (extractor, which) -> {

            final boolean lightTheme = mColorExtractor.getNeutralColors().supportsDarkText();

            mClockView.onColorsChanged(lightTheme);

        };

        mColorExtractor.addOnColorsChangedListener(mOnColorsChangedListener);



        // Don't need to worry about tuner settings for this icon

        mBatteryMeterViewController.ignoreTunerUpdates();
@@ -157,7 +145,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 


    @Override

    protected void onViewDetached() {

        mColorExtractor.removeOnColorsChangedListener(mOnColorsChangedListener);

        mPrivacyIconsController.onParentInvisible();

        mStatusBarIconController.removeIconGroup(mIconManager);

        mQSCarrierGroupController.setOnSingleCarrierChangedListener(null);

packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

+0 −9
Original line number Diff line number Diff line
@@ -37,12 +37,10 @@ import android.text.format.DateFormat; 
import android.text.style.CharacterStyle;

import android.text.style.RelativeSizeSpan;

import android.util.AttributeSet;

import android.view.ContextThemeWrapper;

import android.view.Display;

import android.view.View;

import android.widget.TextView;



import com.android.settingslib.Utils;

import com.android.systemui.Dependency;

import com.android.systemui.FontSizeUtils;

import com.android.systemui.R;
@@ -343,13 +341,6 @@ public class Clock extends TextView implements 
        setTextColor(mNonAdaptedColor);

    }



    // Update text color based when shade scrim changes color.

    public void onColorsChanged(boolean lightTheme) {

        final Context context = new ContextThemeWrapper(mContext,

                lightTheme ? R.style.Theme_SystemUI_LightWallpaper : R.style.Theme_SystemUI);

        setTextColor(Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColor));

    }



    @Override

    public void onDensityOrFontScaleChanged() {

        FontSizeUtils.updateFontSize(this, R.dimen.status_bar_clock_size);

packages/SystemUI/tests/src/com/android/systemui/qs/QuickStatusBarHeaderControllerTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import androidx.test.filters.SmallTest 
import com.android.systemui.R

import com.android.systemui.SysuiTestCase

import com.android.systemui.battery.BatteryMeterViewController

import com.android.systemui.colorextraction.SysuiColorExtractor

import com.android.systemui.demomode.DemoModeController

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.qs.carrier.QSCarrierGroup
@@ -70,8 +69,6 @@ class QuickStatusBarHeaderControllerTest : SysuiTestCase() { 
    @Mock

    private lateinit var qsCarrierGroupController: QSCarrierGroupController

    @Mock

    private lateinit var colorExtractor: SysuiColorExtractor

    @Mock

    private lateinit var iconContainer: StatusIconContainer

    @Mock

    private lateinit var qsCarrierGroup: QSCarrierGroup
@@ -117,7 +114,6 @@ class QuickStatusBarHeaderControllerTest : SysuiTestCase() { 
                demoModeController,

                quickQSPanelController,

                qsCarrierGroupControllerBuilder,

                colorExtractor,

                qsExpansionPathInterpolator,

                batteryMeterViewController,

                featureFlags,