diff options
5 files changed, 126 insertions, 42 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 22f736e367c3..b8538fb567d5 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -658,7 +658,13 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } -// CoreNetworking +// Networking +aconfig_declarations { + name: "com.android.net.flags-aconfig", + package: "com.android.net.flags", + srcs: ["core/java/android/net/flags.aconfig"], +} + java_aconfig_library { name: "com.android.net.flags-aconfig-java", aconfig_declarations: "com.android.net.flags-aconfig", diff --git a/core/java/android/net/flags.aconfig b/core/java/android/net/flags.aconfig new file mode 100644 index 000000000000..0ad1804f402c --- /dev/null +++ b/core/java/android/net/flags.aconfig @@ -0,0 +1,50 @@ +package: "com.android.net.flags" + +flag { + name: "track_multiple_network_activities" + namespace: "android_core_networking" + description: "NetworkActivityTracker tracks multiple networks including non default networks" + bug: "267870186" +} + +flag { + name: "forbidden_capability" + namespace: "android_core_networking" + description: "This flag controls the forbidden capability API" + bug: "302997505" +} + +flag { + name: "set_data_saver_via_cm" + namespace: "android_core_networking" + description: "Set data saver through ConnectivityManager API" + bug: "297836825" +} + +flag { + name: "support_is_uid_networking_blocked" + namespace: "android_core_networking" + description: "This flag controls whether isUidNetworkingBlocked is supported" + bug: "297836825" +} + +flag { + name: "basic_background_restrictions_enabled" + namespace: "android_core_networking" + description: "Block network access for apps in a low importance background state" + bug: "304347838" +} + +flag { + name: "register_nsd_offload_engine" + namespace: "android_core_networking" + description: "The flag controls the access for registerOffloadEngine API in NsdManager" + bug: "294777050" +} + +flag { + name: "ipsec_transform_state" + namespace: "android_core_networking_ipsec" + description: "The flag controls the access for getIpSecTransformState and IpSecTransformState" + bug: "308011229" +} diff --git a/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackConfig.kt b/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackConfig.kt index 7b33e11a0c9c..6cb68bade9a9 100644 --- a/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackConfig.kt @@ -42,4 +42,6 @@ data class SliderHapticFeedbackConfig( @FloatRange(from = 0.0, to = 1.0) val upperBookendScale: Float = 1f, /** Vibration scale at the lower bookend of the slider */ @FloatRange(from = 0.0, to = 1.0) val lowerBookendScale: Float = 0.05f, + /** Exponent for power function compensation */ + @FloatRange(from = 0.0, fromInclusive = false) val exponent: Float = 1f / 0.89f, ) diff --git a/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProvider.kt b/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProvider.kt index f313fb3eef0f..9e6245ae7f21 100644 --- a/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProvider.kt @@ -21,9 +21,11 @@ import android.os.VibrationEffect import android.view.VelocityTracker import android.view.animation.AccelerateInterpolator import androidx.annotation.FloatRange +import androidx.annotation.VisibleForTesting import com.android.systemui.statusbar.VibratorHelper import kotlin.math.abs import kotlin.math.min +import kotlin.math.pow /** * Listener of slider events that triggers haptic feedback. @@ -63,18 +65,29 @@ class SliderHapticFeedbackProvider( * @param[absoluteVelocity] Velocity of the handle when it reached the bookend. */ private fun vibrateOnEdgeCollision(absoluteVelocity: Float) { + val powerScale = scaleOnEdgeCollision(absoluteVelocity) + val vibration = + VibrationEffect.startComposition() + .addPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK, powerScale) + .compose() + vibratorHelper.vibrate(vibration, VIBRATION_ATTRIBUTES_PIPELINING) + } + + /** + * Get the velocity-based scale at the bookends + * + * @param[absoluteVelocity] Velocity of the handle when it reached the bookend. + * @return The power scale for the vibration. + */ + @VisibleForTesting + fun scaleOnEdgeCollision(absoluteVelocity: Float): Float { val velocityInterpolated = velocityAccelerateInterpolator.getInterpolation( min(absoluteVelocity / config.maxVelocityToScale, 1f) ) val bookendScaleRange = config.upperBookendScale - config.lowerBookendScale val bookendsHitScale = bookendScaleRange * velocityInterpolated + config.lowerBookendScale - - val vibration = - VibrationEffect.startComposition() - .addPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK, bookendsHitScale) - .compose() - vibratorHelper.vibrate(vibration, VIBRATION_ATTRIBUTES_PIPELINING) + return bookendsHitScale.pow(config.exponent) } /** @@ -96,6 +109,31 @@ class SliderHapticFeedbackProvider( val deltaProgress = abs(normalizedSliderProgress - dragTextureLastProgress) if (deltaProgress < config.deltaProgressForDragThreshold) return + val powerScale = scaleOnDragTexture(absoluteVelocity, normalizedSliderProgress) + + // Trigger the vibration composition + val composition = VibrationEffect.startComposition() + repeat(config.numberOfLowTicks) { + composition.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, powerScale) + } + vibratorHelper.vibrate(composition.compose(), VIBRATION_ATTRIBUTES_PIPELINING) + dragTextureLastTime = currentTime + dragTextureLastProgress = normalizedSliderProgress + } + + /** + * Get the scale of the drag texture vibration. + * + * @param[absoluteVelocity] Absolute velocity of the handle. + * @param[normalizedSliderProgress] Progress of the slider handled normalized to the range from + * 0F to 1F (inclusive). + * @return the scale of the vibration. + */ + @VisibleForTesting + fun scaleOnDragTexture( + absoluteVelocity: Float, + @FloatRange(from = 0.0, to = 1.0) normalizedSliderProgress: Float + ): Float { val velocityInterpolated = velocityAccelerateInterpolator.getInterpolation( min(absoluteVelocity / config.maxVelocityToScale, 1f) @@ -113,15 +151,7 @@ class SliderHapticFeedbackProvider( // Total scale val scale = positionBasedScale + velocityBasedScale - - // Trigger the vibration composition - val composition = VibrationEffect.startComposition() - repeat(config.numberOfLowTicks) { - composition.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, scale) - } - vibratorHelper.vibrate(composition.compose(), VIBRATION_ATTRIBUTES_PIPELINING) - dragTextureLastTime = currentTime - dragTextureLastProgress = normalizedSliderProgress + return scale.pow(config.exponent) } override fun onHandleAcquiredByTouch() {} diff --git a/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt index 7750d25de753..ab6bc2ca2dda 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderHapticFeedbackProviderTest.kt @@ -71,7 +71,7 @@ class SliderHapticFeedbackProviderTest : SysuiTestCase() { VibrationEffect.startComposition() .addPrimitive( VibrationEffect.Composition.PRIMITIVE_CLICK, - scaleAtBookends(config.maxVelocityToScale) + sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale), ) .compose() @@ -86,7 +86,7 @@ class SliderHapticFeedbackProviderTest : SysuiTestCase() { VibrationEffect.startComposition() .addPrimitive( VibrationEffect.Composition.PRIMITIVE_CLICK, - scaleAtBookends(config.maxVelocityToScale) + sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale) ) .compose() @@ -102,7 +102,7 @@ class SliderHapticFeedbackProviderTest : SysuiTestCase() { VibrationEffect.startComposition() .addPrimitive( VibrationEffect.Composition.PRIMITIVE_CLICK, - scaleAtBookends(config.maxVelocityToScale) + sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale), ) .compose() @@ -117,7 +117,7 @@ class SliderHapticFeedbackProviderTest : SysuiTestCase() { VibrationEffect.startComposition() .addPrimitive( VibrationEffect.Composition.PRIMITIVE_CLICK, - scaleAtBookends(config.maxVelocityToScale) + sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale), ) .compose() @@ -132,7 +132,11 @@ class SliderHapticFeedbackProviderTest : SysuiTestCase() { fun playHapticAtProgress_onQuickSuccession_playsLowTicksOnce() { // GIVEN max velocity and slider progress val progress = 1f - val expectedScale = scaleAtProgressChange(config.maxVelocityToScale.toFloat(), progress) + val expectedScale = + sliderHapticFeedbackProvider.scaleOnDragTexture( + config.maxVelocityToScale, + progress, + ) val ticks = VibrationEffect.startComposition() repeat(config.numberOfLowTicks) { ticks.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, expectedScale) @@ -203,7 +207,11 @@ class SliderHapticFeedbackProviderTest : SysuiTestCase() { fun playHapticAtLowerBookend_afterPlayingAtProgress_playsTwice() { // GIVEN max velocity and slider progress val progress = 1f - val expectedScale = scaleAtProgressChange(config.maxVelocityToScale.toFloat(), progress) + val expectedScale = + sliderHapticFeedbackProvider.scaleOnDragTexture( + config.maxVelocityToScale, + progress, + ) val ticks = VibrationEffect.startComposition() repeat(config.numberOfLowTicks) { ticks.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, expectedScale) @@ -212,7 +220,7 @@ class SliderHapticFeedbackProviderTest : SysuiTestCase() { VibrationEffect.startComposition() .addPrimitive( VibrationEffect.Composition.PRIMITIVE_CLICK, - scaleAtBookends(config.maxVelocityToScale) + sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale), ) .compose() @@ -232,7 +240,11 @@ class SliderHapticFeedbackProviderTest : SysuiTestCase() { fun playHapticAtUpperBookend_afterPlayingAtProgress_playsTwice() { // GIVEN max velocity and slider progress val progress = 1f - val expectedScale = scaleAtProgressChange(config.maxVelocityToScale.toFloat(), progress) + val expectedScale = + sliderHapticFeedbackProvider.scaleOnDragTexture( + config.maxVelocityToScale, + progress, + ) val ticks = VibrationEffect.startComposition() repeat(config.numberOfLowTicks) { ticks.addPrimitive(VibrationEffect.Composition.PRIMITIVE_LOW_TICK, expectedScale) @@ -241,7 +253,7 @@ class SliderHapticFeedbackProviderTest : SysuiTestCase() { VibrationEffect.startComposition() .addPrimitive( VibrationEffect.Composition.PRIMITIVE_CLICK, - scaleAtBookends(config.maxVelocityToScale) + sliderHapticFeedbackProvider.scaleOnEdgeCollision(config.maxVelocityToScale), ) .compose() @@ -289,28 +301,12 @@ class SliderHapticFeedbackProviderTest : SysuiTestCase() { assertEquals(-1f, sliderHapticFeedbackProvider.dragTextureLastProgress) } - private fun scaleAtBookends(velocity: Float): Float { - val range = config.upperBookendScale - config.lowerBookendScale - val interpolatedVelocity = - velocityInterpolator.getInterpolation(velocity / config.maxVelocityToScale) - return interpolatedVelocity * range + config.lowerBookendScale - } - - private fun scaleAtProgressChange(velocity: Float, progress: Float): Float { - val range = config.progressBasedDragMaxScale - config.progressBasedDragMinScale - val interpolatedVelocity = - velocityInterpolator.getInterpolation(velocity / config.maxVelocityToScale) - val interpolatedProgress = progressInterpolator.getInterpolation(progress) - val bump = interpolatedVelocity * config.additionalVelocityMaxBump - return interpolatedProgress * range + config.progressBasedDragMinScale + bump - } - private fun generateTicksComposition(velocity: Float, progress: Float): VibrationEffect { val ticks = VibrationEffect.startComposition() repeat(config.numberOfLowTicks) { ticks.addPrimitive( VibrationEffect.Composition.PRIMITIVE_LOW_TICK, - scaleAtProgressChange(velocity, progress) + sliderHapticFeedbackProvider.scaleOnDragTexture(velocity, progress), ) } return ticks.compose() |