diff options
author | Doug Zongker <dougz@android.com> | 2009-08-18 13:11:16 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-18 13:11:16 -0700 |
commit | 2818107dcc5c7e6ddf152448de8836ce01d3e1ad (patch) | |
tree | af3303aa1a93e2b565921504946793231770315e | |
parent | f509814f6577754243edae217c5b6d51978300e9 (diff) | |
parent | 36efef1d7122aab2cc1172e7b7fe4d79ac98a41f (diff) | |
download | packages_apps_Settings-2818107dcc5c7e6ddf152448de8836ce01d3e1ad.zip packages_apps_Settings-2818107dcc5c7e6ddf152448de8836ce01d3e1ad.tar.gz packages_apps_Settings-2818107dcc5c7e6ddf152448de8836ce01d3e1ad.tar.bz2 |
am 36efef1d: cut number of frames in lock screen demo animation from 15 to 8
Merge commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f' into eclair
* commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f':
cut number of frames in lock screen demo animation from 15 to 8
-rw-r--r-- | res/drawable/lock_anim.xml | 41 | ||||
-rw-r--r-- | res/drawable/lock_anim_00.png (renamed from res/drawable/lock_anim_0.png) | bin | 13458 -> 13458 bytes | |||
-rw-r--r-- | res/drawable/lock_anim_02.png (renamed from res/drawable/lock_anim_2.png) | bin | 14191 -> 14191 bytes | |||
-rw-r--r-- | res/drawable/lock_anim_04.png (renamed from res/drawable/lock_anim_4.png) | bin | 15410 -> 15410 bytes | |||
-rw-r--r-- | res/drawable/lock_anim_06.png (renamed from res/drawable/lock_anim_6.png) | bin | 15985 -> 15985 bytes | |||
-rw-r--r-- | res/drawable/lock_anim_08.png (renamed from res/drawable/lock_anim_8.png) | bin | 15411 -> 15411 bytes | |||
-rw-r--r-- | res/drawable/lock_anim_1.png | bin | 13853 -> 0 bytes | |||
-rw-r--r-- | res/drawable/lock_anim_11.png | bin | 16975 -> 0 bytes | |||
-rw-r--r-- | res/drawable/lock_anim_13.png | bin | 17414 -> 0 bytes | |||
-rw-r--r-- | res/drawable/lock_anim_3.png | bin | 14394 -> 0 bytes | |||
-rw-r--r-- | res/drawable/lock_anim_5.png | bin | 15863 -> 0 bytes | |||
-rw-r--r-- | res/drawable/lock_anim_7.png | bin | 15510 -> 0 bytes | |||
-rw-r--r-- | res/drawable/lock_anim_9.png | bin | 16656 -> 0 bytes |
13 files changed, 17 insertions, 24 deletions
diff --git a/res/drawable/lock_anim.xml b/res/drawable/lock_anim.xml index 8ec31a6..ca1f9d8 100644 --- a/res/drawable/lock_anim.xml +++ b/res/drawable/lock_anim.xml @@ -1,37 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** Copyright 2008, 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 +** 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 +** 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 +** 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. */ --> <animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false"> - <item android:drawable="@drawable/lock_anim_0" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_1" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_2" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_3" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_4" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_5" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_6" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_7" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_8" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_9" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_10" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_11" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_12" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_13" android:duration="200" /> - <item android:drawable="@drawable/lock_anim_14" android:duration="200" /> + <item android:drawable="@drawable/lock_anim_00" android:duration="400" /> + <item android:drawable="@drawable/lock_anim_02" android:duration="400" /> + <item android:drawable="@drawable/lock_anim_04" android:duration="400" /> + <item android:drawable="@drawable/lock_anim_06" android:duration="400" /> + <item android:drawable="@drawable/lock_anim_08" android:duration="400" /> + <item android:drawable="@drawable/lock_anim_10" android:duration="400" /> + <item android:drawable="@drawable/lock_anim_12" android:duration="400" /> + <item android:drawable="@drawable/lock_anim_14" android:duration="400" /> </animation-list> diff --git a/res/drawable/lock_anim_0.png b/res/drawable/lock_anim_00.png Binary files differindex afdda8b..afdda8b 100644 --- a/res/drawable/lock_anim_0.png +++ b/res/drawable/lock_anim_00.png diff --git a/res/drawable/lock_anim_2.png b/res/drawable/lock_anim_02.png Binary files differindex 0542b1d..0542b1d 100644 --- a/res/drawable/lock_anim_2.png +++ b/res/drawable/lock_anim_02.png diff --git a/res/drawable/lock_anim_4.png b/res/drawable/lock_anim_04.png Binary files differindex a3ca629..a3ca629 100644 --- a/res/drawable/lock_anim_4.png +++ b/res/drawable/lock_anim_04.png diff --git a/res/drawable/lock_anim_6.png b/res/drawable/lock_anim_06.png Binary files differindex 90205a6..90205a6 100644 --- a/res/drawable/lock_anim_6.png +++ b/res/drawable/lock_anim_06.png diff --git a/res/drawable/lock_anim_8.png b/res/drawable/lock_anim_08.png Binary files differindex af7cd28..af7cd28 100644 --- a/res/drawable/lock_anim_8.png +++ b/res/drawable/lock_anim_08.png diff --git a/res/drawable/lock_anim_1.png b/res/drawable/lock_anim_1.png Binary files differdeleted file mode 100644 index 6cae8e5..0000000 --- a/res/drawable/lock_anim_1.png +++ /dev/null diff --git a/res/drawable/lock_anim_11.png b/res/drawable/lock_anim_11.png Binary files differdeleted file mode 100644 index 35db815..0000000 --- a/res/drawable/lock_anim_11.png +++ /dev/null diff --git a/res/drawable/lock_anim_13.png b/res/drawable/lock_anim_13.png Binary files differdeleted file mode 100644 index d0b8cf0..0000000 --- a/res/drawable/lock_anim_13.png +++ /dev/null diff --git a/res/drawable/lock_anim_3.png b/res/drawable/lock_anim_3.png Binary files differdeleted file mode 100644 index 7e2ba9a..0000000 --- a/res/drawable/lock_anim_3.png +++ /dev/null diff --git a/res/drawable/lock_anim_5.png b/res/drawable/lock_anim_5.png Binary files differdeleted file mode 100644 index 17e3839..0000000 --- a/res/drawable/lock_anim_5.png +++ /dev/null diff --git a/res/drawable/lock_anim_7.png b/res/drawable/lock_anim_7.png Binary files differdeleted file mode 100644 index 1d94a47..0000000 --- a/res/drawable/lock_anim_7.png +++ /dev/null diff --git a/res/drawable/lock_anim_9.png b/res/drawable/lock_anim_9.png Binary files differdeleted file mode 100644 index d401624..0000000 --- a/res/drawable/lock_anim_9.png +++ /dev/null |