diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-09-14 22:01:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-14 22:01:01 -0700 |
| commit | 1e35ce08ae70575c6127c606dd4ba28f6ff2add1 (patch) | |
| tree | 68f3b88e8a4768496ca56c3ef46e877e2185e065 /res | |
| parent | 47ba486ef20151d0073a9585d51ef9248bc45c88 (diff) | |
| parent | 507aaa672eb8ad5464159021f1b3596cafeede1d (diff) | |
| download | packages_apps_LegacyCamera-1e35ce08ae70575c6127c606dd4ba28f6ff2add1.zip packages_apps_LegacyCamera-1e35ce08ae70575c6127c606dd4ba28f6ff2add1.tar.gz packages_apps_LegacyCamera-1e35ce08ae70575c6127c606dd4ba28f6ff2add1.tar.bz2 | |
Merge "Fix animation for second-level indicator bar."
Diffstat (limited to 'res')
| -rw-r--r-- | res/anim/grow_fade_in_from_top.xml | 18 | ||||
| -rw-r--r-- | res/anim/shrink_fade_out_from_bottom.xml | 18 |
2 files changed, 36 insertions, 0 deletions
diff --git a/res/anim/grow_fade_in_from_top.xml b/res/anim/grow_fade_in_from_top.xml new file mode 100644 index 0000000..22c33f7 --- /dev/null +++ b/res/anim/grow_fade_in_from_top.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator"> + <translate android:fromYDelta="-100%p" android:toYDelta="0" android:duration="300" /> +</set> diff --git a/res/anim/shrink_fade_out_from_bottom.xml b/res/anim/shrink_fade_out_from_bottom.xml new file mode 100644 index 0000000..04bfd6e --- /dev/null +++ b/res/anim/shrink_fade_out_from_bottom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> +<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:anim/accelerate_interpolator"> + <translate android:fromYDelta="0" android:toYDelta="-100%p" android:duration="300" /> +</set> |