Merge changes Ide7d63a7,I9e075f29 into tm-qpr-dev am: 337e5497e7 (683bcf75) · Commits · e / os / android_frameworks_base

packages/SystemUI/animation/src/com/android/systemui/animation/ShadeInterpolation.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ object ShadeInterpolation {

		/**
		* Interpolate alpha for notification background scrim during shade expansion.
		*
		* @param fraction Shade expansion fraction
		*/
		@JvmStatic
		@@ -16,6 +17,7 @@ object ShadeInterpolation {

		/**
		* Interpolate alpha for shade content during shade expansion.
		*
		* @param fraction Shade expansion fraction
		*/
		@JvmStatic

packages/SystemUI/animation/src/com/android/systemui/animation/TextInterpolator.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -161,7 +161,6 @@ class TextInterpolator(layout: Layout) {
		* This API is useful to continue animation from the middle of the state. For example, if you
		* animate weight from 200 to 400, then if you want to move back to 200 at the half of the
		* animation, it will look like
		*
		* <pre> <code>
		* ```
		* val interp = TextInterpolator(layout)
		@@ -497,7 +496,9 @@ class TextInterpolator(layout: Layout) {
		count,
		layout.textDirectionHeuristic,
		paint
		) { _, _, glyphs, _ -> runs.add(glyphs) }
		) { _, _, glyphs, _ ->
		runs.add(glyphs)
		}
		out.add(runs)

		if (lineNo > 0) {

packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/ripple/RippleShader.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import com.android.systemui.surfaceeffects.shaderutil.ShaderUtilLibrary

		/**
		* Shader class that renders an expanding ripple effect. The ripple contains three elements:
		*
		* 1. an expanding filled [RippleShape] that appears in the beginning and quickly fades away
		* 2. an expanding ring that appears throughout the effect
		* 3. an expanding ring-shaped area that reveals noise over #2.
		@@ -311,6 +310,7 @@ class RippleShader(rippleShape: RippleShape = RippleShape.CIRCLE) :
		* Parameters used for fade in and outs of the ripple.
		*
		* <p>Note that all the fade in/ outs are "linear" progression.
		*
		* ```
		* (opacity)
		* 1
		@@ -325,6 +325,7 @@ class RippleShader(rippleShape: RippleShape = RippleShape.CIRCLE) :
		* fadeIn fadeOut
		* Start & End Start & End
		* ```
		*
		* <p>If no fade in/ out is needed, set [fadeInStart] and [fadeInEnd] to 0; [fadeOutStart] and
		* [fadeOutEnd] to 1.
		*/

packages/SystemUI/animation/src/com/android/systemui/surfaceeffects/turbulencenoise/TurbulenceNoiseAnimationConfig.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,12 +30,14 @@ data class TurbulenceNoiseAnimationConfig(
		* Noise move speed variables.
		*
		* Its sign determines the direction; magnitude determines the speed. <ul>
		*
		* ```
		* <li> [noiseMoveSpeedX] positive: right to left; negative: left to right.
		* <li> [noiseMoveSpeedY] positive: bottom to top; negative: top to bottom.
		* <li> [noiseMoveSpeedZ] its sign doesn't matter much, as it moves in Z direction. Use it
		* to add turbulence in place.
		* ```
		*
		* </ul>
		*/
		val noiseMoveSpeedX: Float = 0f,

packages/SystemUI/checks/tests/com/android/internal/systemui/lint/CleanArchitectureDependencyViolationDetectorTest.kt

+18 −9

Original line number	Diff line number	Diff line
		@@ -64,7 +64,8 @@ class CleanArchitectureDependencyViolationDetectorTest : SystemUILintDetectorTes
		class BadClass(
		private val viewModel: ViewModel,
		)
		""".trimIndent()
		"""
		.trimIndent()
		)
		)
		.issues(
		@@ -98,7 +99,8 @@ class CleanArchitectureDependencyViolationDetectorTest : SystemUILintDetectorTes
		class BadClass(
		private val repository: Repository,
		)
		""".trimIndent()
		"""
		.trimIndent()
		)
		)
		.issues(
		@@ -136,7 +138,8 @@ class CleanArchitectureDependencyViolationDetectorTest : SystemUILintDetectorTes
		private val interactor: Interactor,
		private val viewmodel: ViewModel,
		)
		""".trimIndent()
		"""
		.trimIndent()
		)
		)
		.issues(
		@@ -176,7 +179,8 @@ class CleanArchitectureDependencyViolationDetectorTest : SystemUILintDetectorTes
		class BadClass(
		private val interactor: Interactor,
		)
		""".trimIndent()
		"""
		.trimIndent()
		)
		)
		.issues(
		@@ -207,7 +211,8 @@ class CleanArchitectureDependencyViolationDetectorTest : SystemUILintDetectorTes
		data class Model(
		private val name: String,
		)
		""".trimIndent()
		"""
		.trimIndent()
		)
		private val REPOSITORY_FILE =
		TestFiles.kotlin(
		@@ -228,7 +233,8 @@ class CleanArchitectureDependencyViolationDetectorTest : SystemUILintDetectorTes
		return models
		}
		}
		""".trimIndent()
		"""
		.trimIndent()
		)
		private val INTERACTOR_FILE =
		TestFiles.kotlin(
		@@ -245,7 +251,8 @@ class CleanArchitectureDependencyViolationDetectorTest : SystemUILintDetectorTes
		return repository.getModels()
		}
		}
		""".trimIndent()
		"""
		.trimIndent()
		)
		private val VIEW_MODEL_FILE =
		TestFiles.kotlin(
		@@ -262,7 +269,8 @@ class CleanArchitectureDependencyViolationDetectorTest : SystemUILintDetectorTes
		return interactor.getModels().map { model -> model.name }
		}
		}
		""".trimIndent()
		"""
		.trimIndent()
		)
		private val NON_CLEAN_ARCHITECTURE_FILE =
		TestFiles.kotlin(
		@@ -282,7 +290,8 @@ class CleanArchitectureDependencyViolationDetectorTest : SystemUILintDetectorTes
		)
		}
		}
		""".trimIndent()
		"""
		.trimIndent()
		)
		private val LEGITIMATE_FILES =
		arrayOf(