Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust window animations to better match UX spec.

Browse Source 
This introduces new resources for interpolators that match the
types received from UX, and uses them appropriately in the animations.

Change-Id: I68c435ff1c8845c7854fa78f24e33157659b16d1
This commit is contained in:
Dianne Hackborn
2010-11-05 10:49:49 -07:00
parent 55ea91f217
commit 8fe044a3a9
14 changed files with 160 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
api/current.xml
View File

@@ -1482,6 +1482,17 @@
visibility="public"
>
</constructor>
<field name="accelerate_cubic_interpolator"
type="int"
transient="false"
volatile="false"
value="17432591"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="accelerate_decelerate_interpolator"
type="int"
transient="false"
@@ -1504,6 +1515,17 @@
visibility="public"
>
</field>
<field name="accelerate_quint_interpolator"
type="int"
transient="false"
volatile="false"
value="17432593"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="animator_fade_in"
type="int"
transient="false"
@@ -1570,6 +1592,17 @@
visibility="public"
>
</field>
<field name="decelerate_cubic_interpolator"
type="int"
transient="false"
volatile="false"
value="17432592"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="decelerate_interpolator"
type="int"
transient="false"
@@ -1581,6 +1614,17 @@
visibility="public"
>
</field>
<field name="decelerate_quint_interpolator"
type="int"
transient="false"
volatile="false"
value="17432594"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="fade_in"
type="int"
transient="false"
@@ -245869,7 +245913,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="arg0" type="T">
<parameter name="t" type="T">
</parameter>
</method>
</interface>

22
core/res/res/anim/accelerate_cubic_interpolator.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/res/anim/ease_in_interpolator.xml
**
** Copyright 2010, 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.
*/
-->
<accelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
android:factor="1.5" />

22
core/res/res/anim/accelerate_quint_interpolator.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/res/anim/ease_in_interpolator.xml
**
** Copyright 2010, 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.
*/
-->
<accelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
android:factor="2.5" />

4
core/res/res/anim/activity_close_enter.xml
View File

@@ -17,10 +17,8 @@
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@anim/decelerate_interpolator">
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Do nothing. -->
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:interpolator="@anim/decelerate_interpolator"
android:duration="@android:integer/config_mediumAnimTime"/>
</set>

6
core/res/res/anim/activity_close_exit.xml
View File

@@ -17,13 +17,13 @@
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@anim/decelerate_interpolator">
<set xmlns:android="http://schemas.android.com/apk/res/android">
<scale android:fromXScale="1.0" android:toXScale="1.0"
android:fromYScale="1.0" android:toYScale="0.9"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@anim/decelerate_quint_interpolator"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:interpolator="@anim/decelerate_interpolator"
android:interpolator="@anim/decelerate_cubic_interpolator"
android:duration="@android:integer/config_mediumAnimTime"/>
</set>

6
core/res/res/anim/activity_open_enter.xml
View File

@@ -17,13 +17,13 @@
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@anim/decelerate_interpolator">
<set xmlns:android="http://schemas.android.com/apk/res/android">
<scale android:fromXScale="1.0" android:toXScale="1.0"
android:fromYScale="0.9" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@anim/decelerate_quint_interpolator"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha android:fromAlpha="0" android:toAlpha="1.0"
android:interpolator="@anim/accelerate_decelerate_interpolator"
android:interpolator="@anim/decelerate_cubic_interpolator"
android:duration="@android:integer/config_mediumAnimTime"/>
</set>

4
core/res/res/anim/activity_open_exit.xml
View File

@@ -17,10 +17,8 @@
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@anim/decelerate_interpolator">
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Do nothing. -->
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:interpolator="@anim/decelerate_interpolator"
android:duration="@android:integer/config_mediumAnimTime"/>
</set>

22
core/res/res/anim/decelerate_cubic_interpolator.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/res/anim/ease_in_interpolator.xml
**
** Copyright 2010, 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.
*/
-->
<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
android:factor="1.5" />

22
core/res/res/anim/decelerate_quint_interpolator.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/res/anim/ease_in_interpolator.xml
**
** Copyright 2010, 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.
*/
-->
<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
android:factor="2.5" />

4
core/res/res/anim/wallpaper_close_enter.xml
View File

@@ -24,12 +24,12 @@
android:fromYScale=".9" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
android:fillEnabled="true" android:fillBefore="true"
android:interpolator="@anim/decelerate_interpolator"
android:interpolator="@anim/decelerate_quint_interpolator"
android:startOffset="@android:integer/config_mediumAnimTime"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha android:fromAlpha="0" android:toAlpha="1.0"
android:fillEnabled="true" android:fillBefore="true"
android:interpolator="@anim/decelerate_interpolator"
android:interpolator="@anim/decelerate_quint_interpolator"
android:startOffset="@android:integer/config_mediumAnimTime"
android:duration="@android:integer/config_mediumAnimTime"/>
</set>

5
core/res/res/anim/wallpaper_close_exit.xml
View File

@@ -24,16 +24,15 @@
android:fromYScale="1.0" android:toYScale="0.8"
android:pivotX="50%p" android:pivotY="50%p"
android:fillEnabled="true" android:fillAfter="true"
android:interpolator="@anim/decelerate_interpolator"
android:interpolator="@anim/decelerate_quint_interpolator"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:fillEnabled="true" android:fillAfter="true"
android:interpolator="@anim/decelerate_interpolator"
android:interpolator="@anim/decelerate_cubic_interpolator"
android:duration="@android:integer/config_mediumAnimTime"/>
<!-- This is just to keep the animation running for the entire duration. -->
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
android:startOffset="@android:integer/config_mediumAnimTime"
android:interpolator="@anim/decelerate_interpolator"
android:duration="@android:integer/config_mediumAnimTime"/>
</set>

4
core/res/res/anim/wallpaper_open_enter.xml
View File

@@ -19,15 +19,15 @@
<!-- New holo animation, zooming contents on top of wallpaper back up. -->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@anim/decelerate_interpolator"
android:detachWallpaper="true">
<scale android:fromXScale="0.8" android:toXScale="1.0"
android:fromYScale="0.8" android:toYScale="1.0"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@anim/decelerate_quint_interpolator"
android:startOffset="@android:integer/config_mediumAnimTime"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha android:fromAlpha="0" android:toAlpha="1.0"
android:interpolator="@anim/accelerate_decelerate_interpolator"
android:interpolator="@anim/decelerate_cubic_interpolator"
android:startOffset="@android:integer/config_mediumAnimTime"
android:duration="@android:integer/config_mediumAnimTime"/>
</set>

4
core/res/res/anim/wallpaper_open_exit.xml
View File

@@ -23,10 +23,10 @@
<scale android:fromXScale="1.0" android:toXScale="1.0"
android:fromYScale="1.0" android:toYScale=".9"
android:pivotX="50%p" android:pivotY="50%p"
android:interpolator="@anim/decelerate_interpolator"
android:interpolator="@anim/decelerate_quint_interpolator"
android:duration="@android:integer/config_mediumAnimTime" />
<alpha android:fromAlpha="1.0" android:toAlpha="0"
android:interpolator="@anim/accelerate_decelerate_interpolator"
android:interpolator="@anim/decelerate_quint_interpolator"
android:duration="@android:integer/config_mediumAnimTime"/>
</set>

11
core/res/res/values/public.xml
View File

@@ -925,7 +925,9 @@
<public type="anim" name="slide_in_left" id="0x010a0002" />
<public type="anim" name="slide_out_right" id="0x010a0003" />
<public type="anim" name="accelerate_decelerate_interpolator" id="0x010a0004" />
<!-- Acceleration curve matching Flash's quadratic ease out function. -->
<public type="anim" name="accelerate_interpolator" id="0x010a0005" />
<!-- Acceleration curve matching Flash's quadratic ease in function. -->
<public type="anim" name="decelerate_interpolator" id="0x010a0006" />
<!-- ===============================================================
@@ -1364,6 +1366,15 @@
<public type="anim" name="animator_fade_in" />
<public type="anim" name="animator_fade_out" />
<!-- Acceleration curve matching Flash's cubic ease out function. -->
<public type="anim" name="accelerate_cubic_interpolator" />
<!-- Acceleration curve matching Flash's cubic ease in function. -->
<public type="anim" name="decelerate_cubic_interpolator" />
<!-- Acceleration curve matching Flash's quint ease out function. -->
<public type="anim" name="accelerate_quint_interpolator" />
<!-- Acceleration curve matching Flash's quint ease in function. -->
<public type="anim" name="decelerate_quint_interpolator" />
<public type="id" name="home" />
<!-- Context menu ID for the "Select text..." menu item to switch to text
selection context mode in text views. -->