aboutsummaryrefslogtreecommitdiffstats
path: root/res/anim
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2013-11-02 02:20:56 +0100
committerJorge Ruesga <jorge@ruesga.com>2013-11-02 02:20:56 +0100
commit4effddfe30fd045834232f6bb66070edf079578d (patch)
tree2e57f74d55685891a49b02ec069c118cf5b15110 /res/anim
parentca2f0060cc367ac8174a27a3124cd0124e49c627 (diff)
downloadandroid_packages_wallpapers_PhotoPhase-4effddfe30fd045834232f6bb66070edf079578d.tar.gz
android_packages_wallpapers_PhotoPhase-4effddfe30fd045834232f6bb66070edf079578d.tar.bz2
android_packages_wallpapers_PhotoPhase-4effddfe30fd045834232f6bb66070edf079578d.zip
Multiples fixes
- Fully rewrite the album selection preference - Fix multiple style - Fix lints - Resources cleanup Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Diffstat (limited to 'res/anim')
-rw-r--r--res/anim/cards_slide_up.xml (renamed from res/anim/cards_animation_up_left.xml)16
-rw-r--r--res/anim/display_with_bounce.xml2
-rw-r--r--res/anim/picture_animation.xml (renamed from res/anim/cards_animation_up_right.xml)18
-rw-r--r--res/anim/pictures_layout_animation.xml19
4 files changed, 29 insertions, 26 deletions
diff --git a/res/anim/cards_animation_up_left.xml b/res/anim/cards_slide_up.xml
index 6d97f6c..6da2e69 100644
--- a/res/anim/cards_animation_up_left.xml
+++ b/res/anim/cards_slide_up.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
+<!--
+ Copyright (C) 2013 Ahmed Nammari
Copyright (C) 2013 The CyanogenMod Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,22 +16,17 @@
limitations under the License.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:interpolator="@android:anim/accelerate_interpolator" >
+ android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+ android:fillAfter="true">
<translate
- android:duration="@integer/cards_slide_anim"
+ android:duration="@integer/cards_slide_up_anim"
android:fromYDelta="100%p"
android:toYDelta="0" />
<alpha
- android:duration="@integer/cards_slide_anim"
+ android:duration="@integer/cards_slide_up_anim"
android:fromAlpha="0.0"
android:toAlpha="1.0" />
- <rotate
- android:duration="@integer/cards_slide_anim"
- android:fromDegrees="25"
- android:pivotX="0"
- android:pivotY="0"
- android:toDegrees="0" />
</set> \ No newline at end of file
diff --git a/res/anim/display_with_bounce.xml b/res/anim/display_with_bounce.xml
index 3f5a5ad..0a51b53 100644
--- a/res/anim/display_with_bounce.xml
+++ b/res/anim/display_with_bounce.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
+<!--
Copyright (C) 2013 The CyanogenMod Project
Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/res/anim/cards_animation_up_right.xml b/res/anim/picture_animation.xml
index 7b4ef0d..acf7b83 100644
--- a/res/anim/cards_animation_up_right.xml
+++ b/res/anim/picture_animation.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
+<!--
Copyright (C) 2013 The CyanogenMod Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,22 +15,10 @@
limitations under the License.
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
- android:interpolator="@android:anim/accelerate_interpolator" >
-
- <translate
- android:duration="@integer/cards_slide_anim"
- android:fromYDelta="100%p"
- android:toYDelta="0" />
+ android:interpolator="@android:anim/accelerate_decelerate_interpolator" >
<alpha
- android:duration="@integer/cards_slide_anim"
+ android:duration="400"
android:fromAlpha="0.0"
android:toAlpha="1.0" />
-
- <rotate
- android:duration="@integer/cards_slide_anim"
- android:fromDegrees="-25"
- android:pivotX="100%"
- android:pivotY="0"
- android:toDegrees="0" />
</set> \ No newline at end of file
diff --git a/res/anim/pictures_layout_animation.xml b/res/anim/pictures_layout_animation.xml
new file mode 100644
index 0000000..95efcaf
--- /dev/null
+++ b/res/anim/pictures_layout_animation.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 The CyanogenMod 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.
+-->
+<layoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
+ android:animation="@anim/picture_animation"
+ android:delay="5%" />