diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-19 16:52:26 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-19 16:52:26 -0700 |
| commit | 4fcaf8ea9f4d68a0c316337ac147209148421d91 (patch) | |
| tree | 8fb3a74e62ec01013bc43029f840ac2c29e10226 | |
| parent | 6a889551359ff0f8546c24b8e2ffc1dd715241fe (diff) | |
| parent | f9df6bd6e92fcef6bc32225bde412d3b1c0df180 (diff) | |
| download | frameworks_base-4fcaf8ea9f4d68a0c316337ac147209148421d91.zip frameworks_base-4fcaf8ea9f4d68a0c316337ac147209148421d91.tar.gz frameworks_base-4fcaf8ea9f4d68a0c316337ac147209148421d91.tar.bz2 | |
am f9df6bd6: Merge change 1878 into donut
Merge commit 'f9df6bd6e92fcef6bc32225bde412d3b1c0df180'
* commit 'f9df6bd6e92fcef6bc32225bde412d3b1c0df180':
Fixes external #2686. Make @android:anim/linear_interpolator public since the default intperpolator for all animations is accelerate_decelerate.
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index 13c7307..eabccb0 100644 --- a/api/current.xml +++ b/api/current.xml @@ -1471,6 +1471,17 @@ visibility="public" > </field> +<field name="linear_interpolator" + type="int" + transient="false" + volatile="false" + value="17432587" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="overshoot_interpolator" type="int" transient="false" diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index ae45d64..027e0ad 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1106,6 +1106,7 @@ <public type="anim" name="overshoot_interpolator" id="0x010a0008" /> <public type="anim" name="anticipate_overshoot_interpolator" id="0x010a0009" /> <public type="anim" name="bounce_interpolator" id="0x010a000a" /> + <public type="anim" name="linear_interpolator" id="0x010a000b" /> <public type="drawable" name="stat_sys_vp_phone_call" id="0x0108022d" /> <public type="drawable" name="stat_sys_vp_phone_call_on_hold" id="0x0108022e" /> |