diff options
| author | Yuli Huang <yuli@google.com> | 2011-09-12 22:25:30 +0800 |
|---|---|---|
| committer | Yuli Huang <yuli@google.com> | 2011-09-13 00:36:00 +0800 |
| commit | efd1db011b7c85ffd590ec80f535d95070d4371e (patch) | |
| tree | f1bbd820cb903b5b33cb31d96f213d7d9eb2d054 /res/anim | |
| parent | c5de01adfefd310ef212cf83acba4b16a6354bd9 (diff) | |
| download | android_packages_apps_Snap-efd1db011b7c85ffd590ec80f535d95070d4371e.tar.gz android_packages_apps_Snap-efd1db011b7c85ffd590ec80f535d95070d4371e.tar.bz2 android_packages_apps_Snap-efd1db011b7c85ffd590ec80f535d95070d4371e.zip | |
Fix b/4643148: Make PhotoEditor integrated into Gallery.
1. Move PhotoEditor code/resources into Gallery for single apk.
2. Change PhotoEditor package to com.android.gallery3d.photoeditor.
3. Rename PhotoEditor resources to avoid mess up Gallery resources.
4. Move Doodle effect from fix-effects to color-effects.
5. Update PhotoEditor bottom action-bar background.
Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4
Diffstat (limited to 'res/anim')
| -rw-r--r-- | res/anim/photoeditor_fade_in.xml | 21 | ||||
| -rw-r--r-- | res/anim/photoeditor_fade_out.xml | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/res/anim/photoeditor_fade_in.xml b/res/anim/photoeditor_fade_in.xml new file mode 100644 index 000000000..73340410b --- /dev/null +++ b/res/anim/photoeditor_fade_in.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<alpha xmlns:android="http://schemas.android.com/apk/res/android" + android:fromAlpha="0.25" + android:toAlpha="1.0" + android:duration="500" + android:fillAfter="true"/> diff --git a/res/anim/photoeditor_fade_out.xml b/res/anim/photoeditor_fade_out.xml new file mode 100644 index 000000000..ad97c4916 --- /dev/null +++ b/res/anim/photoeditor_fade_out.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<alpha xmlns:android="http://schemas.android.com/apk/res/android" + android:fromAlpha="1.0" + android:toAlpha="0.25" + android:duration="500" + android:fillAfter="true"/> |