diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-20 07:38:33 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-20 07:38:33 -0800 |
| commit | c4ef8241b05b9266de77defcfdf1154f400c77f4 (patch) | |
| tree | 85971c26d631be25a952d7501ea248689cb69509 /res/anim | |
| parent | d8bccef54d490ce562e61fc907201da0c666314e (diff) | |
| download | LegacyCamera-c4ef8241b05b9266de77defcfdf1154f400c77f4.zip LegacyCamera-c4ef8241b05b9266de77defcfdf1154f400c77f4.tar.gz LegacyCamera-c4ef8241b05b9266de77defcfdf1154f400c77f4.tar.bz2 | |
auto import from //branches/cupcake/...@132569
Diffstat (limited to 'res/anim')
| -rw-r--r-- | res/anim/on_screen_hint_accelerate.xml | 21 | ||||
| -rw-r--r-- | res/anim/on_screen_hint_decelerate.xml | 20 | ||||
| -rw-r--r-- | res/anim/on_screen_hint_enter.xml | 5 | ||||
| -rw-r--r-- | res/anim/on_screen_hint_exit.xml | 2 |
4 files changed, 4 insertions, 44 deletions
diff --git a/res/anim/on_screen_hint_accelerate.xml b/res/anim/on_screen_hint_accelerate.xml deleted file mode 100644 index ffbfc39..0000000 --- a/res/anim/on_screen_hint_accelerate.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2009, 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" factor="1" /> diff --git a/res/anim/on_screen_hint_decelerate.xml b/res/anim/on_screen_hint_decelerate.xml deleted file mode 100644 index e63421d..0000000 --- a/res/anim/on_screen_hint_decelerate.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2009, 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" factor="1" /> diff --git a/res/anim/on_screen_hint_enter.xml b/res/anim/on_screen_hint_enter.xml index c7ae9c3..0f00760 100644 --- a/res/anim/on_screen_hint_enter.xml +++ b/res/anim/on_screen_hint_enter.xml @@ -18,5 +18,6 @@ --> <alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@+android:anim/on_screen_hint_decelerate" - android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="400" /> + android:interpolator="@android:anim/decelerate_interpolator" + android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="400" +/> diff --git a/res/anim/on_screen_hint_exit.xml b/res/anim/on_screen_hint_exit.xml index e1d1ff2..e9b38f8 100644 --- a/res/anim/on_screen_hint_exit.xml +++ b/res/anim/on_screen_hint_exit.xml @@ -18,6 +18,6 @@ --> <alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@+android:anim/on_screen_hint_accelerate" + android:interpolator="@android:anim/accelerate_interpolator" android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="400" /> |