Merge "Replaced old light/dark mode qs icons with new animated ones" into tm-qpr-dev (e060de9e) · Commits · e / os / android_frameworks_base

packages/SystemUI/res-keyguard/drawable/qs_light_dark_theme_icon_off.xml

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?><!--
		~ 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
		-->
		<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:aapt="http://schemas.android.com/aapt">
		<target android:name="_R_G_L_0_G_D_1_P_0">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="20"
		android:propertyName="pathData"
		android:startOffset="0"
		android:valueFrom="M7.38 -2.03 C6.38,-4.66 3.47,-7.32 0.01,-7.32 C0.03,-6.22 -0.03,5.66 -0.03,7.28 C1.59,7.31 5.22,6.17 7.37,2.06 C7.37,1.21 7.37,0.69 7.37,0 C7.37,-0.91 7.38,-1.16 7.38,-2.03c "
		android:valueTo="M7.25 -2.44 C5.46,-5.86 1.53,-8.3 -1.72,-7.1 C-1.73,-6.22 -1.73,5.88 -1.7,7.16 C0.25,8.45 4.43,6.91 7.28,2.47 C7.29,1.42 7.27,1.3 7.3,0 C7.32,-1.17 7.27,-1.49 7.25,-2.44c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="40"
		android:propertyName="pathData"
		android:startOffset="20"
		android:valueFrom="M7.25 -2.44 C5.46,-5.86 1.53,-8.3 -1.72,-7.1 C-1.73,-6.22 -1.73,5.88 -1.7,7.16 C0.25,8.45 4.43,6.91 7.28,2.47 C7.29,1.42 7.27,1.3 7.3,0 C7.32,-1.17 7.27,-1.49 7.25,-2.44c "
		android:valueTo="M7.06 -3.94 C3.5,-8.81 -3.31,-9.44 -7,-3.66 C-7.12,-3.47 -7.05,3 -6.94,3.22 C-3.63,9.31 2.94,9.19 7,3.59 C7.06,1.94 7,3.19 7.12,0 C7.19,-2 7.12,-2.75 7.06,-3.94c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="40"
		android:propertyName="pathData"
		android:startOffset="60"
		android:valueFrom="M7.06 -3.94 C3.5,-8.81 -3.31,-9.44 -7,-3.66 C-7.12,-3.47 -7.05,3 -6.94,3.22 C-3.63,9.31 2.94,9.19 7,3.59 C7.06,1.94 7,3.19 7.12,0 C7.19,-2 7.12,-2.75 7.06,-3.94c "
		android:valueTo="M3.11 -6.83 C-0.23,-9.49 -6.06,-6.24 -7.23,-2.29 C-7.28,-2.09 -7.23,1.85 -7.18,2.06 C-5.84,7.25 -0.33,9.23 3.14,6.75 C3.17,5.1 3.17,3.58 3.22,0 C3.25,-3.04 3.14,-5.1 3.11,-6.83c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="100"
		android:propertyName="pathData"
		android:startOffset="100"
		android:valueFrom="M3.11 -6.83 C-0.23,-9.49 -6.06,-6.24 -7.23,-2.29 C-7.28,-2.09 -7.23,1.85 -7.18,2.06 C-5.84,7.25 -0.33,9.23 3.14,6.75 C3.17,5.1 3.17,3.58 3.22,0 C3.25,-3.04 3.14,-5.1 3.11,-6.83c "
		android:valueTo="M0 -7.49 C-2.58,-7.49 -7.45,-4.78 -7.45,-1.62 C-7.45,-1.42 -7.37,0.88 -7.37,1.09 C-7.37,6.31 -2.19,7.55 0,7.55 C0,5.91 -0.01,3.91 -0.01,0 C-0.01,-3.91 0,-5.31 0,-7.49c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.2,1 1.0,1.0" />
		</aapt:attr>
		</objectAnimator>
		</set>
		</aapt:attr>
		</target>
		<target android:name="time_group">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="217"
		android:propertyName="translateX"
		android:startOffset="0"
		android:valueFrom="0"
		android:valueTo="1"
		android:valueType="floatType" />
		</set>
		</aapt:attr>
		</target>
		<aapt:attr name="android:drawable">
		<vector
		android:width="24dp"
		android:height="24dp"
		android:viewportHeight="24"
		android:viewportWidth="24">
		<group android:name="_R_G">
		<group
		android:name="_R_G_L_0_G"
		android:translateX="12"
		android:translateY="12">
		<path
		android:name="_R_G_L_0_G_D_0_P_0"
		android:fillAlpha="1"
		android:fillColor="#ffffff"
		android:fillType="nonZero"
		android:pathData=" M0 -7.08 C-2.69,-7.08 -7.03,-5.19 -7.03,0.03 C-7.03,5.25 -2.19,7.08 0,7.08 C3.03,7.08 7.08,3.91 7.08,0 C7.08,-3.91 3.69,-7.08 0,-7.08c M-8.33 0 C-8.33,-4.6 -4.6,-8.33 0,-8.33 C4.6,-8.33 8.33,-4.6 8.33,0 C8.33,4.6 4.6,8.33 0,8.33 C-4.6,8.33 -8.33,4.6 -8.33,0c " />
		<path
		android:name="_R_G_L_0_G_D_1_P_0"
		android:fillAlpha="1"
		android:fillColor="#ffffff"
		android:fillType="nonZero"
		android:pathData=" M7.38 -2.03 C6.38,-4.66 3.47,-7.32 0.01,-7.32 C0.03,-6.22 -0.03,5.66 -0.03,7.28 C1.59,7.31 5.22,6.17 7.37,2.06 C7.37,1.21 7.37,0.69 7.37,0 C7.37,-0.91 7.38,-1.16 7.38,-2.03c " />
		</group>
		</group>
		<group android:name="time_group" />
		</vector>
		</aapt:attr>
		</animated-vector>

packages/SystemUI/res-keyguard/drawable/qs_light_dark_theme_icon_on.xml

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?><!--
		~ 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
		-->
		<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:aapt="http://schemas.android.com/aapt">
		<target android:name="_R_G_L_0_G_D_1_P_0">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="100"
		android:propertyName="pathData"
		android:startOffset="0"
		android:valueFrom="M0 -7.49 C-2.58,-7.49 -7.45,-4.78 -7.45,-1.62 C-7.45,-1.42 -7.37,0.88 -7.37,1.09 C-7.37,6.31 -2.19,7.55 0,7.55 C0,5.91 -0.01,3.91 -0.01,0 C-0.01,-3.91 0,-5.31 0,-7.49c "
		android:valueTo="M3.11 -6.83 C-0.23,-9.49 -6.06,-6.24 -7.23,-2.29 C-7.28,-2.09 -7.23,1.85 -7.18,2.06 C-5.84,7.25 -0.33,9.23 3.14,6.75 C3.17,5.1 3.17,3.58 3.22,0 C3.25,-3.04 3.14,-5.1 3.11,-6.83c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.833,0.833 1.0,1.0" />
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="67"
		android:propertyName="pathData"
		android:startOffset="100"
		android:valueFrom="M3.11 -6.83 C-0.23,-9.49 -6.06,-6.24 -7.23,-2.29 C-7.28,-2.09 -7.23,1.85 -7.18,2.06 C-5.84,7.25 -0.33,9.23 3.14,6.75 C3.17,5.1 3.17,3.58 3.22,0 C3.25,-3.04 3.14,-5.1 3.11,-6.83c "
		android:valueTo="M7.06 -3.94 C3.5,-8.81 -3.31,-9.44 -7,-3.66 C-7.12,-3.47 -7.05,3 -6.94,3.22 C-3.63,9.31 2.94,9.19 7,3.59 C7.06,1.94 7,3.19 7.12,0 C7.19,-2 7.12,-2.75 7.06,-3.94c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="67"
		android:propertyName="pathData"
		android:startOffset="167"
		android:valueFrom="M7.06 -3.94 C3.5,-8.81 -3.31,-9.44 -7,-3.66 C-7.12,-3.47 -7.05,3 -6.94,3.22 C-3.63,9.31 2.94,9.19 7,3.59 C7.06,1.94 7,3.19 7.12,0 C7.19,-2 7.12,-2.75 7.06,-3.94c "
		android:valueTo="M7.25 -2.44 C5.46,-5.86 1.53,-8.3 -1.72,-7.1 C-1.73,-6.22 -1.73,5.88 -1.7,7.16 C0.25,8.45 4.43,6.91 7.28,2.47 C7.29,1.42 7.27,1.3 7.3,0 C7.32,-1.17 7.27,-1.49 7.25,-2.44c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
		</aapt:attr>
		</objectAnimator>
		<objectAnimator
		android:duration="100"
		android:propertyName="pathData"
		android:startOffset="233"
		android:valueFrom="M7.25 -2.44 C5.46,-5.86 1.53,-8.3 -1.72,-7.1 C-1.73,-6.22 -1.73,5.88 -1.7,7.16 C0.25,8.45 4.43,6.91 7.28,2.47 C7.29,1.42 7.27,1.3 7.3,0 C7.32,-1.17 7.27,-1.49 7.25,-2.44c "
		android:valueTo="M7.38 -2.03 C6.38,-4.66 3.47,-7.32 0.01,-7.32 C0.03,-6.22 -0.03,5.66 -0.03,7.28 C1.59,7.31 5.22,6.17 7.37,2.06 C7.37,1.21 7.37,0.69 7.37,0 C7.37,-0.91 7.38,-1.16 7.38,-2.03c "
		android:valueType="pathType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.2,1 1.0,1.0" />
		</aapt:attr>
		</objectAnimator>
		</set>
		</aapt:attr>
		</target>
		<target android:name="time_group">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="350"
		android:propertyName="translateX"
		android:startOffset="0"
		android:valueFrom="0"
		android:valueTo="1"
		android:valueType="floatType" />
		</set>
		</aapt:attr>
		</target>
		<aapt:attr name="android:drawable">
		<vector
		android:width="24dp"
		android:height="24dp"
		android:viewportHeight="24"
		android:viewportWidth="24">
		<group android:name="_R_G">
		<group
		android:name="_R_G_L_0_G"
		android:translateX="12"
		android:translateY="12">
		<path
		android:name="_R_G_L_0_G_D_0_P_0"
		android:fillAlpha="1"
		android:fillColor="#edf2eb"
		android:fillType="nonZero"
		android:pathData=" M0 -7.08 C-2.69,-7.08 -7.03,-5.19 -7.03,0.03 C-7.03,5.25 -2.19,7.08 0,7.08 C3.03,7.08 7.08,3.91 7.08,0 C7.08,-3.91 3.69,-7.08 0,-7.08c M-8.33 0 C-8.33,-4.6 -4.6,-8.33 0,-8.33 C4.6,-8.33 8.33,-4.6 8.33,0 C8.33,4.6 4.6,8.33 0,8.33 C-4.6,8.33 -8.33,4.6 -8.33,0c " />
		<path
		android:name="_R_G_L_0_G_D_1_P_0"
		android:fillAlpha="1"
		android:fillColor="#edf2eb"
		android:fillType="nonZero"
		android:pathData=" M0 -7.49 C-2.58,-7.49 -7.45,-4.78 -7.45,-1.62 C-7.45,-1.42 -7.37,0.88 -7.37,1.09 C-7.37,6.31 -2.19,7.55 0,7.55 C0,5.91 -0.01,3.91 -0.01,0 C-0.01,-3.91 0,-5.31 0,-7.49c " />
		</group>
		</group>
		<group android:name="time_group" />
		</vector>
		</aapt:attr>
		</animated-vector>

packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.systemui.qs.tiles;

		import android.app.UiModeManager;
		import android.content.Context;
		import android.content.Intent;
		import android.content.res.Configuration;
		import android.os.Handler;
		@@ -60,9 +61,7 @@ public class UiModeNightTile extends QSTileImpl<QSTile.BooleanState> implements
		ConfigurationController.ConfigurationListener,
		BatteryController.BatteryStateChangeCallback {
		public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("hh:mm a");
		private final Icon mIcon = ResourceIcon.get(
		com.android.internal.R.drawable.ic_qs_ui_mode_night);
		private UiModeManager mUiModeManager;
		private final UiModeManager mUiModeManager;
		private final BatteryController mBatteryController;
		private final LocationController mLocationController;
		@Inject
		@@ -82,7 +81,8 @@ public class UiModeNightTile extends QSTileImpl<QSTile.BooleanState> implements
		super(host, backgroundLooper, mainHandler, falsingManager, metricsLogger,
		statusBarStateController, activityStarter, qsLogger);
		mBatteryController = batteryController;
		mUiModeManager = host.getUserContext().getSystemService(UiModeManager.class);
		mUiModeManager = (UiModeManager) host.getUserContext().getSystemService(
		Context.UI_MODE_SERVICE);
		mLocationController = locationController;
		configurationController.observe(getLifecycle(), this);
		batteryController.observe(getLifecycle(), this);
		@@ -155,7 +155,6 @@ public class UiModeNightTile extends QSTileImpl<QSTile.BooleanState> implements
		}
		state.value = nightMode;
		state.label = mContext.getString(R.string.quick_settings_ui_mode_night_label);
		state.icon = mIcon;
		state.contentDescription = TextUtils.isEmpty(state.secondaryLabel)
		? state.label
		: TextUtils.concat(state.label, ", ", state.secondaryLabel);
		@@ -164,6 +163,9 @@ public class UiModeNightTile extends QSTileImpl<QSTile.BooleanState> implements
		} else {
		state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
		}
		state.icon = ResourceIcon.get(state.state == Tile.STATE_ACTIVE
		? R.drawable.qs_light_dark_theme_icon_on
		: R.drawable.qs_light_dark_theme_icon_off);
		state.showRippleEffect = false;
		state.expandedAccessibilityClassName = Switch.class.getName();
		}

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/UiModeNightTileTest.kt

0 → 100644

+141 −0

Original line number	Diff line number	Diff line
		/*
		* 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.app.UiModeManager
		import android.content.Context
		import android.content.res.Configuration
		import android.content.res.Resources
		import android.os.Handler
		import android.test.suitebuilder.annotation.SmallTest
		import android.testing.AndroidTestingRunner
		import android.testing.TestableLooper
		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.BatteryController
		import com.android.systemui.statusbar.policy.ConfigurationController
		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 UiModeNightTileTest : SysuiTestCase() {

		@Mock
		private lateinit var mockContext: Context
		@Mock
		private lateinit var uiModeManager: UiModeManager
		@Mock
		private lateinit var resources: Resources
		@Mock
		private lateinit var qsLogger: QSLogger
		@Mock
		private lateinit var qsHost: QSTileHost
		@Mock
		private lateinit var metricsLogger: MetricsLogger
		@Mock
		private lateinit var statusBarStateController: StatusBarStateController
		@Mock
		private lateinit var activityStarter: ActivityStarter
		@Mock
		private lateinit var configurationController: ConfigurationController
		@Mock
		private lateinit var batteryController: BatteryController
		@Mock
		private lateinit var locationController: LocationController

		private val uiEventLogger = UiEventLoggerFake()
		private val falsingManager = FalsingManagerFake()
		private lateinit var testableLooper: TestableLooper
		private lateinit var tile: UiModeNightTile
		private lateinit var configuration: Configuration

		@Before
		fun setUp() {
		MockitoAnnotations.initMocks(this)
		testableLooper = TestableLooper.get(this)
		configuration = Configuration()
		mContext.addMockSystemService(Context.UI_MODE_SERVICE, uiModeManager)

		`when`(qsHost.context).thenReturn(mockContext)
		`when`(qsHost.userContext).thenReturn(mContext)
		`when`(mockContext.resources).thenReturn(resources)
		`when`(resources.configuration).thenReturn(configuration)
		`when`(qsHost.uiEventLogger).thenReturn(uiEventLogger)

		tile = UiModeNightTile(
		qsHost,
		testableLooper.looper,
		Handler(testableLooper.looper),
		falsingManager,
		metricsLogger,
		statusBarStateController,
		activityStarter,
		qsLogger,
		configurationController,
		batteryController,
		locationController)
		}

		@Test
		fun testIcon_whenNightModeOn_isOnState() {
		val state = QSTile.BooleanState()
		setNightModeOn()

		tile.handleUpdateState(state, /* arg= */ null)

		assertThat(state.icon)
		.isEqualTo(QSTileImpl.ResourceIcon.get(R.drawable.qs_light_dark_theme_icon_on))
		}

		@Test
		fun testIcon_whenNightModeOn_isOffState() {
		val state = QSTile.BooleanState()
		setNightModeOff()

		tile.handleUpdateState(state, /* arg= */ null)

		assertThat(state.icon)
		.isEqualTo(QSTileImpl.ResourceIcon.get(R.drawable.qs_light_dark_theme_icon_off))
		}

		private fun setNightModeOn() {
		`when`(uiModeManager.nightMode).thenReturn(UiModeManager.MODE_NIGHT_YES)
		configuration.uiMode = Configuration.UI_MODE_NIGHT_YES
		}

		private fun setNightModeOff() {
		`when`(uiModeManager.nightMode).thenReturn(UiModeManager.MODE_NIGHT_NO)
		configuration.uiMode = Configuration.UI_MODE_NIGHT_NO
		}
		}