Merge "Replaced DoNotDisturb QS tiles with new animated ones" into tm-qpr-dev (20a3b057) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/qs_dnd_icon_off.xml

0 → 100644

+56 −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="time_group">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="183"
		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:rotation="-225"
		android:scaleX="0.85"
		android:scaleY="0.85"
		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=" M-2.83 -4.24 C-2.83,-4.24 4.24,2.83 4.24,2.83 C4.24,2.83 2.83,4.24 2.83,4.24 C2.83,4.24 -4.24,-2.83 -4.24,-2.83 C-4.24,-2.83 -2.83,-4.24 -2.83,-4.24c M7.07 7.09 C4.65,9.51 1.78,10.02 0,10.02 C-5.52,10.02 -10,5.54 -10,0.02 C-10,-1.76 -9.49,-4.52 -7.07,-7.07 C-7.07,-7.07 -5.66,-5.67 -5.66,-5.67 C-7.73,-3.44 -8,-1.2 -8,0.02 C-8,4.43 -4.41,8.02 0,8.02 C1.22,8.02 3.42,7.71 5.67,5.64 C5.67,5.64 7.07,7.09 7.07,7.09c M-7.06 -7.1 C-4.62,-9.54 -1.81,-9.94 -0.03,-9.94 C5.49,-9.94 9.97,-5.46 9.97,0.06 C9.97,1.84 9.49,4.63 7.07,7.05 C7.07,7.05 5.66,5.64 5.66,5.64 C7.67,3.51 7.97,1.28 7.97,0.06 C7.97,-4.35 4.38,-7.94 -0.03,-7.94 C-1.25,-7.94 -3.43,-7.88 -5.65,-5.66 C-5.65,-5.66 -7.06,-7.1 -7.06,-7.1c " />
		</group>
		</group>
		<group android:name="time_group" />
		</vector>
		</aapt:attr>
		</animated-vector>

packages/SystemUI/res/drawable/qs_dnd_icon_on.xml

0 → 100644

+73 −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">
		<aapt:attr name="android:animation">
		<set android:ordering="together">
		<objectAnimator
		android:duration="500"
		android:propertyName="rotation"
		android:startOffset="0"
		android:valueFrom="-225"
		android:valueTo="-45"
		android:valueType="floatType">
		<aapt:attr name="android:interpolator">
		<pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 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="517"
		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:rotation="-225"
		android:scaleX="0.85"
		android:scaleY="0.85"
		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=" M-2.83 -4.24 C-2.83,-4.24 4.24,2.83 4.24,2.83 C4.24,2.83 2.83,4.24 2.83,4.24 C2.83,4.24 -4.24,-2.83 -4.24,-2.83 C-4.24,-2.83 -2.83,-4.24 -2.83,-4.24c M7.07 7.09 C4.65,9.51 1.78,10.02 0,10.02 C-5.52,10.02 -10,5.54 -10,0.02 C-10,-1.76 -9.49,-4.52 -7.07,-7.07 C-7.07,-7.07 -5.66,-5.67 -5.66,-5.67 C-7.73,-3.44 -8,-1.2 -8,0.02 C-8,4.43 -4.41,8.02 0,8.02 C1.22,8.02 3.42,7.71 5.67,5.64 C5.67,5.64 7.07,7.09 7.07,7.09c M-7.06 -7.1 C-4.62,-9.54 -1.81,-9.94 -0.03,-9.94 C5.49,-9.94 9.97,-5.46 9.97,0.06 C9.97,1.84 9.49,4.63 7.07,7.05 C7.07,7.05 5.66,5.64 5.66,5.64 C7.67,3.51 7.97,1.28 7.97,0.06 C7.97,-4.35 4.38,-7.94 -0.03,-7.94 C-1.25,-7.94 -3.43,-7.88 -5.65,-5.66 C-5.65,-5.66 -7.06,-7.1 -7.06,-7.1c " />
		</group>
		</group>
		<group android:name="time_group" />
		</vector>
		</aapt:attr>
		</animated-vector>

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -226,16 +226,15 @@ public class DndTile extends QSTileImpl<BooleanState> {
		if (mController == null) return;
		final int zen = arg instanceof Integer ? (Integer) arg : mController.getZen();
		final boolean newValue = zen != ZEN_MODE_OFF;
		final boolean valueChanged = state.value != newValue;
		if (state.slash == null) state.slash = new SlashState();
		state.dualTarget = true;
		state.value = newValue;
		state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
		state.slash.isSlashed = !state.value;
		state.icon = ResourceIcon.get(state.value
		? R.drawable.qs_dnd_icon_on
		: R.drawable.qs_dnd_icon_off);
		state.label = getTileLabel();
		state.secondaryLabel = TextUtils.emptyIfNull(ZenModeConfig.getDescription(mContext,
		zen != Global.ZEN_MODE_OFF, mController.getConfig(), false));
		state.icon = ResourceIcon.get(com.android.internal.R.drawable.ic_qs_dnd);
		checkIfRestrictionEnforcedByAdminOnly(state, UserManager.DISALLOW_ADJUST_VOLUME);
		// Keeping the secondaryLabel in contentDescription instead of stateDescription is easier
		// to understand.

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

+33 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.ContextWrapper
		import android.content.SharedPreferences
		import android.os.Handler
		import android.provider.Settings
		import android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS
		import android.provider.Settings.Global.ZEN_MODE_OFF
		import android.testing.AndroidTestingRunner
		import android.testing.TestableLooper
		@@ -28,13 +29,16 @@ import android.view.View
		import androidx.test.filters.SmallTest
		import com.android.internal.logging.MetricsLogger
		import com.android.internal.logging.UiEventLogger
		import com.android.systemui.R
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.animation.DialogLaunchAnimator
		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.ZenModeController
		import com.android.systemui.util.mockito.any
		import com.android.systemui.util.mockito.eq
		@@ -66,22 +70,31 @@ class DndTileTest : SysuiTestCase() {

		@Mock
		private lateinit var qsHost: 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 uiEventLogger: UiEventLogger

		@Mock
		private lateinit var zenModeController: ZenModeController

		@Mock
		private lateinit var sharedPreferences: SharedPreferences

		@Mock
		private lateinit var dialogLaunchAnimator: DialogLaunchAnimator

		@Mock
		private lateinit var hostDialog: Dialog

		@@ -190,4 +203,24 @@ class DndTileTest : SysuiTestCase() {

		verify(dialogLaunchAnimator, never()).showFromView(any(), any(), nullable(), anyBoolean())
		}

		@Test
		fun testIcon_whenDndModeOff_isOffState() {
		whenever(zenModeController.zen).thenReturn(ZEN_MODE_OFF)
		val state = QSTile.BooleanState()

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

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

		@Test
		fun testIcon_whenDndModeOn_isOnState() {
		whenever(zenModeController.zen).thenReturn(ZEN_MODE_NO_INTERRUPTIONS)
		val state = QSTile.BooleanState()

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

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