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

Commit 9cb20eb6 authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "Restore missing line" into rvc-dev am: cf842066 

Change-Id: Ia47b8fe19335db5a9b72bb49c24c2dff185f5f2b
parents 9df61d54 cf842066

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

+1 −6
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEX 
import static com.android.systemui.util.Utils.useQsMediaPlayer;

import static com.android.systemui.util.Utils.useQsMediaPlayer;





import android.annotation.Nullable;

import android.annotation.Nullable;

import android.app.Notification;

import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;
@@ -30,8 +29,6 @@ import android.content.IntentFilter; 
import android.content.SharedPreferences;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.Resources;

import android.graphics.Color;

import android.graphics.drawable.Drawable;

import android.media.MediaDescription;

import android.media.MediaDescription;

import android.metrics.LogMaker;

import android.metrics.LogMaker;

import android.os.Bundle;

import android.os.Bundle;
@@ -50,7 +47,6 @@ import android.widget.LinearLayout; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.statusbar.NotificationVisibility;

import com.android.settingslib.Utils;

import com.android.settingslib.Utils;

import com.android.systemui.Dependency;

import com.android.systemui.Dependency;

import com.android.systemui.Dumpable;

import com.android.systemui.Dumpable;
@@ -60,7 +56,6 @@ import com.android.systemui.dump.DumpManager; 
import com.android.systemui.media.MediaControlPanel;

import com.android.systemui.media.MediaControlPanel;

import com.android.systemui.media.MediaHierarchyManager;

import com.android.systemui.media.MediaHierarchyManager;

import com.android.systemui.media.MediaHost;

import com.android.systemui.media.MediaHost;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.qs.DetailAdapter;

import com.android.systemui.plugins.qs.DetailAdapter;

import com.android.systemui.plugins.qs.QSTile;

import com.android.systemui.plugins.qs.QSTile;

import com.android.systemui.plugins.qs.QSTileView;

import com.android.systemui.plugins.qs.QSTileView;
@@ -70,7 +65,6 @@ import com.android.systemui.qs.external.CustomTile; 
import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.settings.BrightnessController;

import com.android.systemui.settings.BrightnessController;

import com.android.systemui.settings.ToggleSliderView;

import com.android.systemui.settings.ToggleSliderView;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.policy.BrightnessMirrorController;

import com.android.systemui.statusbar.policy.BrightnessMirrorController;

import com.android.systemui.statusbar.policy.BrightnessMirrorController.BrightnessMirrorListener;

import com.android.systemui.statusbar.policy.BrightnessMirrorController.BrightnessMirrorListener;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.tuner.TunerService;
@@ -545,6 +539,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne 




    public void setListening(boolean listening) {

    public void setListening(boolean listening) {

        if (mListening == listening) return;

        if (mListening == listening) return;

        mListening = listening;

        if (mTileLayout != null) {

        if (mTileLayout != null) {

            mQSLogger.logAllTilesChangeListening(listening, getDumpableTag(), mCachedSpecs);

            mQSLogger.logAllTilesChangeListening(listening, getDumpableTag(), mCachedSpecs);

            mTileLayout.setListening(listening);

            mTileLayout.setListening(listening);

packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -161,6 +161,9 @@ public class QSPanelTest extends SysuiTestCase { 




        mQsPanel.setListening(true);

        mQsPanel.setListening(true);

        verify(mQSLogger).logAllTilesChangeListening(true, mQsPanel.getDumpableTag(), "dnd");

        verify(mQSLogger).logAllTilesChangeListening(true, mQsPanel.getDumpableTag(), "dnd");



        mQsPanel.setListening(false);

        verify(mQSLogger).logAllTilesChangeListening(false, mQsPanel.getDumpableTag(), "dnd");

    }

    }





/*    @Test

/*    @Test