From 4c31bd8a21c6f956f9944b7d92c8db7225a3daff Mon Sep 17 00:00:00 2001 From: Rasheed Lewis Date: Tue, 26 Apr 2022 14:37:45 +0000 Subject: [PATCH] Replaced Camera Access QS Icons with New ones Test: Unit and manually tested Fixes: 230466578 Change-Id: Ibf0905274baed7a61ad2441803a30e6d5f368f56 --- .../drawable/qs_camera_access_icon_off.xml | 110 +++++++++++++++++ .../res/drawable/qs_camera_access_icon_on.xml | 93 +++++++++++++++ .../systemui/qs/tiles/CameraToggleTile.java | 4 +- .../systemui/qs/tiles/CameraToggleTileTest.kt | 112 ++++++++++++++++++ 4 files changed, 317 insertions(+), 2 deletions(-) create mode 100644 packages/SystemUI/res/drawable/qs_camera_access_icon_off.xml create mode 100644 packages/SystemUI/res/drawable/qs_camera_access_icon_on.xml create mode 100644 packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CameraToggleTileTest.kt diff --git a/packages/SystemUI/res/drawable/qs_camera_access_icon_off.xml b/packages/SystemUI/res/drawable/qs_camera_access_icon_off.xml new file mode 100644 index 0000000000000..8f9ecbe482e3a --- /dev/null +++ b/packages/SystemUI/res/drawable/qs_camera_access_icon_off.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/qs_camera_access_icon_on.xml b/packages/SystemUI/res/drawable/qs_camera_access_icon_on.xml new file mode 100644 index 0000000000000..beb8b72d29ad8 --- /dev/null +++ b/packages/SystemUI/res/drawable/qs_camera_access_icon_on.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CameraToggleTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CameraToggleTile.java index fa2d4447f26d2..ee41f1d1077d4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CameraToggleTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CameraToggleTile.java @@ -72,9 +72,9 @@ public class CameraToggleTile extends SensorPrivacyToggleTile { @Override public @DrawableRes int getIconRes(boolean isBlocked) { if (isBlocked) { - return com.android.internal.R.drawable.ic_camera_blocked; + return R.drawable.qs_camera_access_icon_off; } else { - return com.android.internal.R.drawable.ic_camera_allowed; + return R.drawable.qs_camera_access_icon_on; } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CameraToggleTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CameraToggleTileTest.kt new file mode 100644 index 0000000000000..cfbb82f5f3388 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CameraToggleTileTest.kt @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.tiles + +import android.os.Handler +import android.testing.AndroidTestingRunner +import android.testing.TestableLooper +import androidx.test.filters.SmallTest +import com.android.internal.logging.MetricsLogger +import com.android.internal.logging.UiEventLogger +import com.android.internal.logging.testing.UiEventLoggerFake +import com.android.systemui.R +import com.android.systemui.SysuiTestCase +import com.android.systemui.classifier.FalsingManagerFake +import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.plugins.qs.QSTile +import com.android.systemui.plugins.statusbar.StatusBarStateController +import com.android.systemui.qs.QSHost +import com.android.systemui.qs.logging.QSLogger +import com.android.systemui.qs.tileimpl.QSTileImpl +import com.android.systemui.statusbar.policy.IndividualSensorPrivacyController +import com.android.systemui.statusbar.policy.KeyguardStateController +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mock +import org.mockito.MockitoAnnotations +import org.mockito.Mockito.`when` as whenever + +@RunWith(AndroidTestingRunner::class) +@TestableLooper.RunWithLooper(setAsMainLooper = true) +@SmallTest +class CameraToggleTileTest : SysuiTestCase() { + companion object { + /* isBlocked */ + const val CAMERA_TOGGLE_ENABLED: Boolean = false + const val CAMERA_TOGGLE_DISABLED: Boolean = true + } + + @Mock + private lateinit var host: QSHost + @Mock + private lateinit var metricsLogger: MetricsLogger + @Mock + private lateinit var statusBarStateController: StatusBarStateController + @Mock + private lateinit var activityStarter: ActivityStarter + @Mock + private lateinit var qsLogger: QSLogger + @Mock + private lateinit var privacyController: IndividualSensorPrivacyController + @Mock + private lateinit var keyguardStateController: KeyguardStateController + + private lateinit var testableLooper: TestableLooper + private lateinit var tile: CameraToggleTile + private val uiEventLogger: UiEventLogger = UiEventLoggerFake() + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + testableLooper = TestableLooper.get(this) + whenever(host.context).thenReturn(mContext) + whenever(host.uiEventLogger).thenReturn(uiEventLogger) + + tile = CameraToggleTile(host, + testableLooper.looper, + Handler(testableLooper.looper), + metricsLogger, + FalsingManagerFake(), + statusBarStateController, + activityStarter, + qsLogger, + privacyController, + keyguardStateController) + } + + @Test + fun testIcon_whenCameraAccessEnabled_isOnState() { + val state = QSTile.BooleanState() + + tile.handleUpdateState(state, CAMERA_TOGGLE_ENABLED) + + assertThat(state.icon) + .isEqualTo(QSTileImpl.ResourceIcon.get(R.drawable.qs_camera_access_icon_on)) + } + + @Test + fun testIcon_whenCameraAccessDisabled_isOffState() { + val state = QSTile.BooleanState() + + tile.handleUpdateState(state, CAMERA_TOGGLE_DISABLED) + + assertThat(state.icon) + .isEqualTo(QSTileImpl.ResourceIcon.get(R.drawable.qs_camera_access_icon_off)) + } +}