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

Commit 13253a22 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make clock in QS not clickable" into sc-dev am: d031c6a3 am: fbcd33b0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14948714

Change-Id: I334b0e39edeb9deba95639c5e08706ab57e1f20b
parents 9aba4598 fbcd33b0

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

+1 −8
Original line number Original line Diff line number Diff line
@@ -16,9 +16,7 @@ 




package com.android.systemui.qs;

package com.android.systemui.qs;





import android.content.Intent;

import android.os.Bundle;

import android.os.Bundle;

import android.provider.AlarmClock;

import android.view.View;

import android.view.View;

import android.view.View.OnClickListener;

import android.view.View.OnClickListener;
@@ -113,10 +111,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
    private View.OnClickListener mOnClickListener = new OnClickListener() {

    private View.OnClickListener mOnClickListener = new OnClickListener() {

        @Override

        @Override

        public void onClick(View v) {

        public void onClick(View v) {

            if (v == mClockView) {

            if (v == mPrivacyChip) {

                mActivityStarter.postStartActivityDismissingKeyguard(new Intent(

                        AlarmClock.ACTION_SHOW_ALARMS), 0);

            } else if (v == mPrivacyChip) {

                // If the privacy chip is visible, it means there were some indicators

                // If the privacy chip is visible, it means there were some indicators

                mUiEventLogger.log(PrivacyChipEvent.ONGOING_INDICATORS_CHIP_CLICK);

                mUiEventLogger.log(PrivacyChipEvent.ONGOING_INDICATORS_CHIP_CLICK);

                mPrivacyDialogController.showDialog(getContext());

                mPrivacyDialogController.showDialog(getContext());
@@ -167,7 +162,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 




    @Override

    @Override

    protected void onViewAttached() {

    protected void onViewAttached() {

        mClockView.setOnClickListener(mOnClickListener);

        mPrivacyChip.setOnClickListener(mOnClickListener);

        mPrivacyChip.setOnClickListener(mOnClickListener);





        mMicCameraIndicatorsEnabled = mPrivacyItemController.getMicCameraAvailable();

        mMicCameraIndicatorsEnabled = mPrivacyItemController.getMicCameraAvailable();
@@ -188,7 +182,6 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 




    @Override

    @Override

    protected void onViewDetached() {

    protected void onViewDetached() {

        mClockView.setOnClickListener(null);

        mColorExtractor.removeOnColorsChangedListener(mOnColorsChangedListener);

        mColorExtractor.removeOnColorsChangedListener(mOnColorsChangedListener);

        mPrivacyChip.setOnClickListener(null);

        mPrivacyChip.setOnClickListener(null);

        mStatusBarIconController.removeIconGroup(mIconManager);

        mStatusBarIconController.removeIconGroup(mIconManager);

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -126,6 +126,11 @@ class QuickStatusBarHeaderControllerTest : SysuiTestCase() { 
        controller.onViewDetached()

        controller.onViewDetached()

    }

    }





    @Test

    fun testClockNotClickable() {

        assertThat(clock.isClickable).isFalse()

    }



    @Test

    @Test

    fun testIgnoredSlotsOnAttached_noIndicators() {

    fun testIgnoredSlotsOnAttached_noIndicators() {

        setPrivacyController(micCamera = false, location = false)

        setPrivacyController(micCamera = false, location = false)