From c48d87955b85afd733bfdec14cfb4ef3fb6fd49e Mon Sep 17 00:00:00 2001 From: Rasheed Lewis Date: Wed, 6 Jul 2022 03:52:43 +0000 Subject: Replaced Location QS Icons with Animations Fixes: 238127926 Test: atest LocationTileTest Change-Id: I8455304f131c45f004e10ab2ca50327f0f321753 --- .../SystemUI/res/drawable/qs_location_icon_off.xml | 166 +++++++++++++++++++++ .../SystemUI/res/drawable/qs_location_icon_on.xml | 155 +++++++++++++++++++ .../android/systemui/qs/tiles/LocationTile.java | 6 +- .../android/systemui/qs/tiles/LocationTileTest.kt | 112 ++++++++++++++ 4 files changed, 435 insertions(+), 4 deletions(-) create mode 100644 packages/SystemUI/res/drawable/qs_location_icon_off.xml create mode 100644 packages/SystemUI/res/drawable/qs_location_icon_on.xml create mode 100644 packages/SystemUI/tests/src/com/android/systemui/qs/tiles/LocationTileTest.kt diff --git a/packages/SystemUI/res/drawable/qs_location_icon_off.xml b/packages/SystemUI/res/drawable/qs_location_icon_off.xml new file mode 100644 index 000000000000..97eb91cd33b0 --- /dev/null +++ b/packages/SystemUI/res/drawable/qs_location_icon_off.xml @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/qs_location_icon_on.xml b/packages/SystemUI/res/drawable/qs_location_icon_on.xml new file mode 100644 index 000000000000..c56b6508eb49 --- /dev/null +++ b/packages/SystemUI/res/drawable/qs_location_icon_on.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java index fc93f44a44aa..9466a694ea1b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java @@ -48,8 +48,6 @@ import javax.inject.Inject; /** Quick settings tile: Location **/ public class LocationTile extends QSTileImpl { - private final Icon mIcon = ResourceIcon.get(R.drawable.ic_location); - private final LocationController mController; private final KeyguardStateController mKeyguard; private final Callback mCallback = new Callback(); @@ -119,8 +117,8 @@ public class LocationTile extends QSTileImpl { if (state.disabledByPolicy == false) { checkIfRestrictionEnforcedByAdminOnly(state, UserManager.DISALLOW_CONFIG_LOCATION); } - state.icon = mIcon; - state.slash.isSlashed = !state.value; + state.icon = ResourceIcon.get(state.value + ? R.drawable.qs_location_icon_on : R.drawable.qs_location_icon_off); state.label = mContext.getString(R.string.quick_settings_location_label); state.contentDescription = state.label; state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/LocationTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/LocationTileTest.kt new file mode 100644 index 000000000000..d2bbc8cfac39 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/LocationTileTest.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.content.Context +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.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.QSTileHost +import com.android.systemui.qs.logging.QSLogger +import com.android.systemui.qs.tileimpl.QSTileImpl +import com.android.systemui.statusbar.policy.KeyguardStateController +import com.android.systemui.statusbar.policy.LocationController +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.Mockito.`when` +import org.mockito.MockitoAnnotations + +@RunWith(AndroidTestingRunner::class) +@TestableLooper.RunWithLooper(setAsMainLooper = true) +@SmallTest +class LocationTileTest : SysuiTestCase() { + + @Mock + private lateinit var mockContext: Context + @Mock + private lateinit var qsLogger: QSLogger + @Mock + private lateinit var qsHost: QSTileHost + @Mock + private lateinit var metricsLogger: MetricsLogger + private val falsingManager = FalsingManagerFake() + @Mock + private lateinit var statusBarStateController: StatusBarStateController + @Mock + private lateinit var activityStarter: ActivityStarter + @Mock + private lateinit var locationController: LocationController + @Mock + private lateinit var keyguardStateController: KeyguardStateController + + private val uiEventLogger = UiEventLoggerFake() + private lateinit var testableLooper: TestableLooper + private lateinit var tile: LocationTile + + @Before + fun setUp() { + MockitoAnnotations.initMocks(this) + testableLooper = TestableLooper.get(this) + `when`(qsHost.uiEventLogger).thenReturn(uiEventLogger) + `when`(qsHost.context).thenReturn(mockContext) + + tile = LocationTile(qsHost, + testableLooper.looper, + Handler(testableLooper.looper), + falsingManager, + metricsLogger, + statusBarStateController, + activityStarter, + qsLogger, + locationController, + keyguardStateController) + } + + @Test + fun testIcon_whenDisabled_isOffState() { + val state = QSTile.BooleanState() + `when`(locationController.isLocationEnabled).thenReturn(false) + + tile.handleUpdateState(state, /* arg= */ null) + + assertThat(state.icon) + .isEqualTo(QSTileImpl.ResourceIcon.get(R.drawable.qs_location_icon_off)) + } + + @Test + fun testIcon_whenEnabled_isOnState() { + val state = QSTile.BooleanState() + `when`(locationController.isLocationEnabled).thenReturn(true) + + tile.handleUpdateState(state, /* arg= */ null) + + assertThat(state.icon) + .isEqualTo(QSTileImpl.ResourceIcon.get(R.drawable.qs_location_icon_on)) + } +} -- cgit v1.2.3-59-g8ed1b