summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/res/anim/control_state_list_animator.xml4
-rw-r--r--packages/SystemUI/res/interpolator/control_state.xml22
2 files changed, 26 insertions, 0 deletions
diff --git a/packages/SystemUI/res/anim/control_state_list_animator.xml b/packages/SystemUI/res/anim/control_state_list_animator.xml
index 7940b8874ece..a20a9255f86f 100644
--- a/packages/SystemUI/res/anim/control_state_list_animator.xml
+++ b/packages/SystemUI/res/anim/control_state_list_animator.xml
@@ -18,11 +18,13 @@
<item android:state_pressed="true">
<set>
<objectAnimator
+ android:interpolator="@interpolator/control_state"
android:duration="50"
android:propertyName="scaleX"
android:valueTo="0.97"
android:valueType="floatType" />
<objectAnimator
+ android:interpolator="@interpolator/control_state"
android:duration="50"
android:propertyName="scaleY"
android:valueTo="0.97"
@@ -33,11 +35,13 @@
<item>
<set>
<objectAnimator
+ android:interpolator="@interpolator/control_state"
android:duration="250"
android:propertyName="scaleX"
android:valueTo="1"
android:valueType="floatType" />
<objectAnimator
+ android:interpolator="@interpolator/control_state"
android:duration="250"
android:propertyName="scaleY"
android:valueTo="1"
diff --git a/packages/SystemUI/res/interpolator/control_state.xml b/packages/SystemUI/res/interpolator/control_state.xml
new file mode 100644
index 000000000000..66106d48d507
--- /dev/null
+++ b/packages/SystemUI/res/interpolator/control_state.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2020 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.
+ -->
+<pathInterpolator
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:controlX1="0"
+ android:controlY1="0"
+ android:controlX2="1"
+ android:controlY2="1"/>