Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make clock in QS not clickable" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-14 17:36:31 +00:00
committed by Android (Google) Code Review
parent 7395d119e6 77ec71a437
commit d031c6a3ce
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java
View File

@@ -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);

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

@@ -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)