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/layout/photoeditor_effects_color.xml | |
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/layout/photoeditor_effects_color.xml')
-rw-r--r-- | res/layout/photoeditor_effects_color.xml | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/res/layout/photoeditor_effects_color.xml b/res/layout/photoeditor_effects_color.xml new file mode 100644 index 000000000..c078dfaa2 --- /dev/null +++ b/res/layout/photoeditor_effects_color.xml @@ -0,0 +1,103 @@ +<?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. +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/EffectsContainer"> + + <com.android.gallery3d.photoeditor.actions.ColorTemperatureAction style="@style/Effect"> + <ImageButton + android:id="@+id/effect_button" + style="@style/EffectIcon" + android:src="@drawable/photoeditor_effect_temperature"/> + <TextView + android:id="@+id/effect_label" + android:text="@string/temperature" + style="@style/EffectLabel"/> + </com.android.gallery3d.photoeditor.actions.ColorTemperatureAction> + <com.android.gallery3d.photoeditor.actions.SaturationAction style="@style/Effect"> + <ImageButton + android:id="@+id/effect_button" + style="@style/EffectIcon" + android:src="@drawable/photoeditor_effect_saturation"/> + <TextView + android:id="@+id/effect_label" + android:text="@string/saturation" + style="@style/EffectLabel"/> + </com.android.gallery3d.photoeditor.actions.SaturationAction> + <com.android.gallery3d.photoeditor.actions.GrayscaleAction style="@style/Effect"> + <ImageButton + android:id="@+id/effect_button" + style="@style/EffectIcon" + android:src="@drawable/photoeditor_effect_grayscale"/> + <TextView + android:id="@+id/effect_label" + android:text="@string/grayscale" + style="@style/EffectLabel"/> + </com.android.gallery3d.photoeditor.actions.GrayscaleAction> + <com.android.gallery3d.photoeditor.actions.SepiaAction style="@style/Effect"> + <ImageButton + android:id="@+id/effect_button" + style="@style/EffectIcon" + android:src="@drawable/photoeditor_effect_sepia"/> + <TextView + android:id="@+id/effect_label" + android:text="@string/sepia" + style="@style/EffectLabel"/> + </com.android.gallery3d.photoeditor.actions.SepiaAction> + <com.android.gallery3d.photoeditor.actions.NegativeAction style="@style/Effect"> + <ImageButton + android:id="@+id/effect_button" + style="@style/EffectIcon" + android:src="@drawable/photoeditor_effect_negative"/> + <TextView + android:id="@+id/effect_label" + android:text="@string/negative" + style="@style/EffectLabel"/> + </com.android.gallery3d.photoeditor.actions.NegativeAction> + <com.android.gallery3d.photoeditor.actions.TintAction style="@style/Effect"> + <ImageButton + android:id="@+id/effect_button" + style="@style/EffectIcon" + android:src="@drawable/photoeditor_effect_tint"/> + <TextView + android:id="@+id/effect_label" + android:text="@string/tint" + style="@style/EffectLabel"/> + </com.android.gallery3d.photoeditor.actions.TintAction> + <com.android.gallery3d.photoeditor.actions.DuotoneAction style="@style/Effect"> + <ImageButton + android:id="@+id/effect_button" + style="@style/EffectIcon" + android:src="@drawable/photoeditor_effect_duotone"/> + <TextView + android:id="@+id/effect_label" + android:text="@string/duotone" + style="@style/EffectLabel"/> + </com.android.gallery3d.photoeditor.actions.DuotoneAction> + <com.android.gallery3d.photoeditor.actions.DoodleAction style="@style/Effect" + android:tag="@string/doodle_tooltip"> + <ImageButton + android:id="@+id/effect_button" + style="@style/EffectIcon" + android:src="@drawable/photoeditor_effect_doodle"/> + <TextView + android:id="@+id/effect_label" + android:text="@string/doodle" + style="@style/EffectLabel"/> + </com.android.gallery3d.photoeditor.actions.DoodleAction> + +</LinearLayout> |