Snap for 11227258 from b87b35a209205e6406c3cf2a12b42b8d81da2a11 to 24Q2-release (3f712669) · Commits · e / os / android_frameworks_libs_systemui

aconfig/biometrics.aconfig

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		package: "com.android.systemui.shared"

		# Note: for shared flags across SystemUI & framework

		flag {
		name: "sidefps_controller_refactor"
		namespace: "biometrics_framework"
		description: "flag for SideFpsController refactor"
		bug: "288175061"
		}

animationlib/src/com/android/app/animation/Interpolators.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,14 @@ public class Interpolators {
		*/
		public static final Interpolator EMPHASIZED = createEmphasizedInterpolator();

		/**
		* Complement to {@link #EMPHASIZED}. Used when animating hero movement in two dimensions to
		* create a smooth, emphasized, curved movement.
		* <br>
		* Example usage: Animate y-movement with {@link #EMPHASIZED} and x-movement with this.
		*/
		public static final Interpolator EMPHASIZED_COMPLEMENT = createEmphasizedComplement();

		/**
		* The accelerated emphasized interpolator. Used for hero / emphasized movement of content that
		* is disappearing e.g. when moving off screen.
		@@ -311,6 +319,18 @@ public class Interpolators {
		return new PathInterpolator(path);
		}

		/**
		* Creates a complement to {@link #createEmphasizedInterpolator()} for use when animating in
		* two dimensions.
		*/
		private static PathInterpolator createEmphasizedComplement() {
		Path path = new Path();
		path.moveTo(0f, 0f);
		path.cubicTo(0.1217f, 0.0462f, 0.15f, 0.4686f, 0.1667f, 0.66f);
		path.cubicTo(0.1834f, 0.8878f, 0.1667f, 1f, 1f, 1f);
		return new PathInterpolator(path);
		}

		/**
		* Returns a function that runs the given interpolator such that the entire progress is set
		* between the given bounds. That is, we set the interpolation to 0 until lowerBound and reach

animationlib/src/com/android/app/animation/InterpolatorsAndroidX.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,14 @@ public class InterpolatorsAndroidX {
		*/
		public static final Interpolator EMPHASIZED = createEmphasizedInterpolator();

		/**
		* Complement to {@link #EMPHASIZED}. Used when animating hero movement in two dimensions to
		* create a smooth, emphasized, curved movement.
		* <br>
		* Example usage: Animate y-movement with {@link #EMPHASIZED} and x-movement with this.
		*/
		public static final Interpolator EMPHASIZED_COMPLEMENT = createEmphasizedComplement();

		/**
		* The accelerated emphasized interpolator. Used for hero / emphasized movement of content that
		* is disappearing e.g. when moving off screen.
		@@ -317,6 +325,18 @@ public class InterpolatorsAndroidX {
		return new PathInterpolator(path);
		}

		/**
		* Creates a complement to {@link #createEmphasizedInterpolator()} for use when animating in
		* two dimensions.
		*/
		private static PathInterpolator createEmphasizedComplement() {
		Path path = new Path();
		path.moveTo(0f, 0f);
		path.cubicTo(0.1217f, 0.0462f, 0.15f, 0.4686f, 0.1667f, 0.66f);
		path.cubicTo(0.1834f, 0.8878f, 0.1667f, 1f, 1f, 1f);
		return new PathInterpolator(path);
		}

		/**
		* Returns a function that runs the given interpolator such that the entire progress is set
		* between the given bounds. That is, we set the interpolation to 0 until lowerBound and reach

iconloaderlib/res/drawable/ic_clone_app_badge.xml

+5 −16

Original line number	Diff line number	Diff line
		@@ -17,27 +17,16 @@
		android:width="@dimen/profile_badge_size"
		android:height="@dimen/profile_badge_size"
		android:viewportWidth="24"
		android:viewportHeight="24">

		<path
		android:fillColor="#11000000"
		android:pathData="M.5,12.25
		A11.5,11.5 0 1,1 23.5,12.25
		A11.5,11.5 0 1,1 .5,12.25" />

		<path
		android:fillColor="@android:color/white"
		android:pathData="M1,12
		A11,11 0 1,1 23,12
		A11,11 0 1,1 1,12" />
		android:viewportHeight="24"
		android:tint="#ff3C4043">

		<group android:scaleX=".6" android:scaleY=".6" android:pivotX="12" android:pivotY="12">
		<path
		android:pathData="M22,9.5C22,13.642 18.642,17 14.5,17C10.358,17 7,13.642 7,9.5C7,5.358 10.358,2 14.5,2C18.642,2 22,5.358 22,9.5Z"
		android:fillColor="#ff3C4043"/>
		android:fillColor="#FFFFFFFF"/>
		<path
		android:pathData="M9.5,20.333C12.722,20.333 15.333,17.722 15.333,14.5C15.333,11.278 12.722,8.667 9.5,8.667C6.278,8.667 3.667,11.278 3.667,14.5C3.667,17.722 6.278,20.333 9.5,20.333ZM9.5,22C13.642,22 17,18.642 17,14.5C17,10.358 13.642,7 9.5,7C5.358,7 2,10.358 2,14.5C2,18.642 5.358,22 9.5,22Z"
		android:fillColor="#ff3C4043"
		android:fillColor="#FFFFFFFF"
		android:fillType="evenOdd"/>
		</group>
		</vector>

iconloaderlib/res/drawable/ic_clone_app_badge_themed.xml

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2023 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="@dimen/profile_badge_size"
		android:height="@dimen/profile_badge_size"
		android:viewportWidth="24"
		android:viewportHeight="24">

		<path
		android:fillColor="#11000000"
		android:pathData="M.5,12.25
		A11.5,11.5 0 1,1 23.5,12.25
		A11.5,11.5 0 1,1 .5,12.25" />

		<path
		android:fillColor="@color/themed_icon_background_color"
		android:pathData="M1,12
		A11,11 0 1,1 23,12
		A11,11 0 1,1 1,12" />

		<group android:scaleX=".6" android:scaleY=".6" android:pivotX="12" android:pivotY="12">
		<path
		android:pathData="M22,9.5C22,13.642 18.642,17 14.5,17C10.358,17 7,13.642 7,9.5C7,5.358 10.358,2 14.5,2C18.642,2 22,5.358 22,9.5Z"
		android:fillColor="@color/themed_badge_icon_color"/>
		<path
		android:pathData="M9.5,20.333C12.722,20.333 15.333,17.722 15.333,14.5C15.333,11.278 12.722,8.667 9.5,8.667C6.278,8.667 3.667,11.278 3.667,14.5C3.667,17.722 6.278,20.333 9.5,20.333ZM9.5,22C13.642,22 17,18.642 17,14.5C17,10.358 13.642,7 9.5,7C5.358,7 2,10.358 2,14.5C2,18.642 5.358,22 9.5,22Z"
		android:fillColor="@color/themed_badge_icon_color"
		android:fillType="evenOdd"/>
		</group>
		</vector>