diff options
author | Yuli Huang <yuli@google.com> | 2011-11-28 20:05:27 +0800 |
---|---|---|
committer | Yuli Huang <yuli@google.com> | 2011-12-02 00:57:02 +0800 |
commit | 14ff23808f86b3d3618177c86e0edf148dced11b (patch) | |
tree | 9a8641a991d04764cb4eea0a858b7a6b3ce2f76d /res/layout | |
parent | eeb85e875d49c23b4ffcc627b60ffcb29fbd4809 (diff) | |
download | android_packages_apps_Snap-14ff23808f86b3d3618177c86e0edf148dced11b.tar.gz android_packages_apps_Snap-14ff23808f86b3d3618177c86e0edf148dced11b.tar.bz2 android_packages_apps_Snap-14ff23808f86b3d3618177c86e0edf148dced11b.zip |
Refactor to remove obsolete design and improve code consistency.
1. Remove isValid()/validate() in Filter; EffectAction would push
filters into the stack when being notified by notifyChanged().
2. Make RedEyeAction consistent with DoodleAction by ignoring
out-of-bounds operations.
3. Improve consistency by encapsulate effect-tool creation/removal in
one class (EffectToolFactory).
4. Minimize variable visibility in EffectAction subclasses.
5. Fix unfinished doodle lost when exiting Doodle effect by multi-touch.
Change-Id: I8d3b127c5fe8777eb45b7c5ae680f6a30a99635a
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/photoeditor_crop_view.xml | 1 | ||||
-rw-r--r-- | res/layout/photoeditor_doodle_view.xml | 1 | ||||
-rw-r--r-- | res/layout/photoeditor_effect_tool_fullscreen.xml | 20 | ||||
-rw-r--r-- | res/layout/photoeditor_flip_view.xml | 1 | ||||
-rw-r--r-- | res/layout/photoeditor_rotate_view.xml | 1 | ||||
-rw-r--r-- | res/layout/photoeditor_touch_view.xml | 1 |
6 files changed, 20 insertions, 5 deletions
diff --git a/res/layout/photoeditor_crop_view.xml b/res/layout/photoeditor_crop_view.xml index 151e6a678..bf5cacb07 100644 --- a/res/layout/photoeditor_crop_view.xml +++ b/res/layout/photoeditor_crop_view.xml @@ -16,5 +16,4 @@ <com.android.gallery3d.photoeditor.actions.CropView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/fullscreen_effect_tool" style="@style/FullscreenToolView"/> diff --git a/res/layout/photoeditor_doodle_view.xml b/res/layout/photoeditor_doodle_view.xml index d8e08683c..c202f1431 100644 --- a/res/layout/photoeditor_doodle_view.xml +++ b/res/layout/photoeditor_doodle_view.xml @@ -16,5 +16,4 @@ <com.android.gallery3d.photoeditor.actions.DoodleView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/fullscreen_effect_tool" style="@style/FullscreenToolView"/> diff --git a/res/layout/photoeditor_effect_tool_fullscreen.xml b/res/layout/photoeditor_effect_tool_fullscreen.xml new file mode 100644 index 000000000..a6dd32365 --- /dev/null +++ b/res/layout/photoeditor_effect_tool_fullscreen.xml @@ -0,0 +1,20 @@ +<?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. +--> + +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> diff --git a/res/layout/photoeditor_flip_view.xml b/res/layout/photoeditor_flip_view.xml index 0b7a7a743..150b24e28 100644 --- a/res/layout/photoeditor_flip_view.xml +++ b/res/layout/photoeditor_flip_view.xml @@ -16,5 +16,4 @@ <com.android.gallery3d.photoeditor.actions.FlipView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/fullscreen_effect_tool" style="@style/FullscreenToolView"/> diff --git a/res/layout/photoeditor_rotate_view.xml b/res/layout/photoeditor_rotate_view.xml index 9dbe9d02d..0e85fd4a3 100644 --- a/res/layout/photoeditor_rotate_view.xml +++ b/res/layout/photoeditor_rotate_view.xml @@ -16,5 +16,4 @@ <com.android.gallery3d.photoeditor.actions.RotateView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/fullscreen_effect_tool" style="@style/FullscreenToolView"/> diff --git a/res/layout/photoeditor_touch_view.xml b/res/layout/photoeditor_touch_view.xml index 39a087127..a6da07879 100644 --- a/res/layout/photoeditor_touch_view.xml +++ b/res/layout/photoeditor_touch_view.xml @@ -16,5 +16,4 @@ <com.android.gallery3d.photoeditor.actions.TouchView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/fullscreen_effect_tool" style="@style/FullscreenToolView"/> |