Merge "Replaced Invert Colors QS Icons with New Animation" into tm-qpr-dev am:... (68ce3298) · Commits · e / os / android_frameworks_base

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

0 → 100644

+109 −0

Original line number	Original line	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_0_P_0">
			<aapt:attr name="android:animation">
			<set android:ordering="together">
			<objectAnimator
			android:duration="17"
			android:propertyName="pathData"
			android:startOffset="0"
			android:valueFrom="M7.38 -0.28 C5.69,-2.81 1.5,-8.5 0.01,-7.32 C0.03,-6.22 -0.06,6.16 -0.06,7.78 C1.56,7.81 5.44,7.19 7.37,2.06 C7.37,1.21 7.35,1.69 7.35,1 C7.35,0.09 7.38,0.59 7.38,-0.28c "
			android:valueTo="M6 -2.38 C1.81,-6.69 -0.5,-10 -1.72,-7.1 C-1.73,-6.22 -1.73,5.88 -1.7,7.16 C0.25,8.45 3,7.75 5.47,4.91 C6.33,3.91 7.21,2.42 7.24,1.13 C7.26,-0.05 6.87,-1.49 6,-2.38c "
			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="33"
			android:propertyName="pathData"
			android:startOffset="17"
			android:valueFrom="M6 -2.38 C1.81,-6.69 -0.5,-10 -1.72,-7.1 C-1.73,-6.22 -1.73,5.88 -1.7,7.16 C0.25,8.45 3,7.75 5.47,4.91 C6.33,3.91 7.21,2.42 7.24,1.13 C7.26,-0.05 6.87,-1.49 6,-2.38c "
			android:valueTo="M4.94 -3.95 C-0.31,-9.06 0.52,-9.42 -5.75,-3.22 C-8.31,-0.69 -7.05,3 -6.94,3.22 C-3.63,9.31 2.63,9.5 5.94,4.59 C6.61,3.6 7.43,1.16 7.12,0 C6.72,-1.45 6.01,-2.9 4.94,-3.95c "
			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="50"
			android:valueFrom="M4.94 -3.95 C-0.31,-9.06 0.52,-9.42 -5.75,-3.22 C-8.31,-0.69 -7.05,3 -6.94,3.22 C-3.63,9.31 2.63,9.5 5.94,4.59 C6.61,3.6 7.43,1.16 7.12,0 C6.72,-1.45 6.01,-2.9 4.94,-3.95c "
			android:valueTo="M3.07 -5.83 C-0.44,-10.25 -2.56,-6.87 -6.11,-2.6 C-7.03,-1.49 -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.1,-4.1 3.07,-5.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="83"
			android:propertyName="pathData"
			android:startOffset="117"
			android:valueFrom="M3.07 -5.83 C-0.44,-10.25 -2.56,-6.87 -6.11,-2.6 C-7.03,-1.49 -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.1,-4.1 3.07,-5.83c "
			android:valueTo="M0 -8.18 C-1.81,-7.06 -3.89,-5.21 -5.95,-2.81 C-7.56,-0.94 -7.37,0.88 -7.37,1.09 C-7.37,6.31 -2.19,7.99 0,7.99 C0,6.34 -0.01,3.91 -0.01,0 C-0.01,-3.91 0,-6 0,-8.18c "
			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="433"
			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=" M7.38 -0.28 C5.69,-2.81 1.5,-8.5 0.01,-7.32 C0.03,-6.22 -0.06,6.16 -0.06,7.78 C1.56,7.81 5.44,7.19 7.37,2.06 C7.37,1.21 7.35,1.69 7.35,1 C7.35,0.09 7.38,0.59 7.38,-0.28c " />
			<path
			android:name="_R_G_L_0_G_D_1_P_0"
			android:fillAlpha="1"
			android:fillColor="#ffffff"
			android:fillType="nonZero"
			android:pathData=" M0 -7.19 C0,-7.19 2.93,-4.32 4.38,-2.87 C5.25,-2 5.88,-0.62 5.88,1.19 C5.88,4.5 2.8,6.97 0,7 C-2.8,7.03 -6,4.37 -6,1.13 C-6,-0.43 -5.38,-1.9 -4.25,-3.01 C-4.25,-3.01 0,-7.19 0,-7.19 M-5.65 -4.44 C-5.65,-4.44 -5.65,-4.44 -5.65,-4.44 C-7.1,-3.01 -8,-1.04 -8,1.13 C-8,5.48 -4.42,9 0,9 C4.42,9 8,5.48 8,1.13 C8,-1.04 7.1,-3.01 5.65,-4.44 C5.65,-4.44 5.65,-4.44 5.65,-4.44 C5.65,-4.44 0,-10 0,-10 C0,-10 -5.65,-4.44 -5.65,-4.44c " />
			</group>
			</group>
			<group android:name="time_group" />
			</vector>
			</aapt:attr>
			</animated-vector>

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

0 → 100644

+109 −0

Original line number	Original line	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_0_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.47,-2.59 -7.47,0.57 C-7.47,0.77 -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-1.37,-10.12 -6.04,-3.87 -7.22,0.09 C-7.26,0.29 -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-1.37,-10.12 -6.04,-3.87 -7.22,0.09 C-7.26,0.29 -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="M5 -3.95 C-0.25,-9.87 -0.47,-8.74 -5,-3.63 C-7.94,-0.31 -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 5.06,-2.75 5,-3.95c "
			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="M5 -3.95 C-0.25,-9.87 -0.47,-8.74 -5,-3.63 C-7.94,-0.31 -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 5.06,-2.75 5,-3.95c "
			android:valueTo="M4.82 -3.81 C1,-7.87 0.75,-9.37 -1.72,-7.1 C-1.73,-6.22 -1.73,5.88 -1.7,7.16 C0.25,8.45 4.38,7.38 6.4,3.22 C6.77,2.46 7,1.69 6.74,0 C6.56,-1.16 5.85,-2.71 4.82,-3.81c "
			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="M4.82 -3.81 C1,-7.87 0.75,-9.37 -1.72,-7.1 C-1.73,-6.22 -1.73,5.88 -1.7,7.16 C0.25,8.45 4.38,7.38 6.4,3.22 C6.77,2.46 7,1.69 6.74,0 C6.56,-1.16 5.85,-2.71 4.82,-3.81c "
			android:valueTo="M5.63 -2.97 C3.65,-4.93 0.75,-8.37 0.01,-7.32 C0.03,-6.22 -0.03,5.66 -0.03,7.28 C1.59,7.31 4.13,7.94 6.31,3.44 C6.68,2.66 7,1.37 6.87,0.06 C6.77,-0.84 6.13,-2.47 5.63,-2.97c "
			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="433"
			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.49 C-2.58,-7.49 -7.47,-2.59 -7.47,0.57 C-7.47,0.77 -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 " />
			<path
			android:name="_R_G_L_0_G_D_1_P_0"
			android:fillAlpha="1"
			android:fillColor="#ffffff"
			android:fillType="nonZero"
			android:pathData=" M0 -7.19 C0,-7.19 2.93,-4.32 4.38,-2.87 C5.25,-2 5.88,-0.62 5.88,1.19 C5.88,4.5 2.8,6.97 0,7 C-2.8,7.03 -6,4.37 -6,1.13 C-6,-0.43 -5.38,-1.9 -4.25,-3.01 C-4.25,-3.01 0,-7.19 0,-7.19 M-5.65 -4.44 C-5.65,-4.44 -5.65,-4.44 -5.65,-4.44 C-7.1,-3.01 -8,-1.04 -8,1.13 C-8,5.48 -4.42,9 0,9 C4.42,9 8,5.48 8,1.13 C8,-1.04 7.1,-3.01 5.65,-4.44 C5.65,-4.44 5.65,-4.44 5.65,-4.44 C5.65,-4.44 0,-10 0,-10 C0,-10 -5.65,-4.44 -5.65,-4.44c " />
			</group>
			</group>
			<group android:name="time_group" />
			</vector>
			</aapt:attr>
			</animated-vector>

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,6 @@ import javax.inject.Inject;
	/ Quick settings tile: Invert colors /		/ Quick settings tile: Invert colors /
	public class ColorInversionTile extends QSTileImpl<BooleanState> {		public class ColorInversionTile extends QSTileImpl<BooleanState> {

	private final Icon mIcon = ResourceIcon.get(drawable.ic_invert_colors);
	private final SettingObserver mSetting;		private final SettingObserver mSetting;

	@Inject		@Inject
	@@ -123,7 +122,9 @@ public class ColorInversionTile extends QSTileImpl<BooleanState> {
	state.value = enabled;		state.value = enabled;
	state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;		state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
	state.label = mContext.getString(R.string.quick_settings_inversion_label);		state.label = mContext.getString(R.string.quick_settings_inversion_label);
	state.icon = mIcon;		state.icon = ResourceIcon.get(state.value
			? drawable.qs_invert_colors_icon_on
			: drawable.qs_invert_colors_icon_off);
	state.expandedAccessibilityClassName = Switch.class.getName();		state.expandedAccessibilityClassName = Switch.class.getName();
	state.contentDescription = state.label;		state.contentDescription = state.label;
	}		}

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ColorInversionTileTest.java

+25 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,12 +33,15 @@ import androidx.test.filters.SmallTest;

	import com.android.internal.logging.MetricsLogger;		import com.android.internal.logging.MetricsLogger;
	import com.android.internal.logging.UiEventLogger;		import com.android.internal.logging.UiEventLogger;
			import com.android.systemui.R;
	import com.android.systemui.SysuiTestCase;		import com.android.systemui.SysuiTestCase;
	import com.android.systemui.classifier.FalsingManagerFake;		import com.android.systemui.classifier.FalsingManagerFake;
	import com.android.systemui.plugins.ActivityStarter;		import com.android.systemui.plugins.ActivityStarter;
			import com.android.systemui.plugins.qs.QSTile;
	import com.android.systemui.plugins.statusbar.StatusBarStateController;		import com.android.systemui.plugins.statusbar.StatusBarStateController;
	import com.android.systemui.qs.QSTileHost;		import com.android.systemui.qs.QSTileHost;
	import com.android.systemui.qs.logging.QSLogger;		import com.android.systemui.qs.logging.QSLogger;
			import com.android.systemui.qs.tileimpl.QSTileImpl;
	import com.android.systemui.settings.UserTracker;		import com.android.systemui.settings.UserTracker;
	import com.android.systemui.util.settings.FakeSettings;		import com.android.systemui.util.settings.FakeSettings;
	import com.android.systemui.util.settings.SecureSettings;		import com.android.systemui.util.settings.SecureSettings;
	@@ -54,6 +57,8 @@ import org.mockito.MockitoAnnotations;
	@TestableLooper.RunWithLooper(setAsMainLooper = true)		@TestableLooper.RunWithLooper(setAsMainLooper = true)
	@SmallTest		@SmallTest
	public class ColorInversionTileTest extends SysuiTestCase {		public class ColorInversionTileTest extends SysuiTestCase {
			private static final Integer COLOR_INVERSION_DISABLED = 0;
			private static final Integer COLOR_INVERSION_ENABLED = 1;

	@Mock		@Mock
	private QSTileHost mHost;		private QSTileHost mHost;
	@@ -113,4 +118,24 @@ public class ColorInversionTileTest extends SysuiTestCase {
	assertThat(IntentCaptor.getValue().getAction()).isEqualTo(		assertThat(IntentCaptor.getValue().getAction()).isEqualTo(
	Settings.ACTION_COLOR_INVERSION_SETTINGS);		Settings.ACTION_COLOR_INVERSION_SETTINGS);
	}		}

			@Test
			public void testIcon_whenColorInversionDisabled_isOffState() {
			QSTile.BooleanState state = new QSTile.BooleanState();

			mTile.handleUpdateState(state, COLOR_INVERSION_DISABLED);

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

			@Test
			public void testIcon_whenColorInversionEnabled_isOnState() {
			QSTile.BooleanState state = new QSTile.BooleanState();

			mTile.handleUpdateState(state, COLOR_INVERSION_ENABLED);

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