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
--- /dev/null
+<?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"/>
--- /dev/null
+<?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"/>
--- /dev/null
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+ <item android:state_selected="true" android:drawable="@drawable/photoeditor_toggle_button_highlight" />
+ <item android:state_pressed="true" android:drawable="@drawable/photoeditor_toggle_button_highlight" />
+ <item android:drawable="@android:color/transparent" />
+
+</selector>
--- /dev/null
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.ColorSeekBar
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="@dimen/seekbar_width"
+ android:layout_height="@dimen/seekbar_height"
+ android:layout_marginBottom="@dimen/seekbar_margin_bottom"
+ android:minHeight="@dimen/seekbar_height"
+ android:maxHeight="@dimen/seekbar_height"
+ android:progressDrawable="@android:color/transparent"/>
--- /dev/null
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.CropView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/fullscreen_effect_tool"
+ style="@style/FullscreenToolView"/>
--- /dev/null
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.DoodleView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/fullscreen_effect_tool"
+ style="@style/FullscreenToolView"/>
--- /dev/null
+<?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"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/effect_tool_panel_padding"
+ android:background="@color/translucent_black"
+ android:gravity="center_horizontal"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/effect_label"
+ style="@style/EffectLabel"/>
+</LinearLayout>
--- /dev/null
+<?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.CrossProcessAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_crossprocess"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/crossprocess"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.CrossProcessAction>
+ <com.android.gallery3d.photoeditor.actions.PosterizeAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_posterize"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/posterize"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.PosterizeAction>
+ <com.android.gallery3d.photoeditor.actions.LomoishAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_lomoish"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/lomoish"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.LomoishAction>
+ <com.android.gallery3d.photoeditor.actions.DocumentaryAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_documentary"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/documentary"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.DocumentaryAction>
+ <com.android.gallery3d.photoeditor.actions.VignetteAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_vignette"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/vignette"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.VignetteAction>
+ <com.android.gallery3d.photoeditor.actions.GrainAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_grain"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/grain"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.GrainAction>
+ <com.android.gallery3d.photoeditor.actions.FisheyeAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_fisheye"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/fisheye"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.FisheyeAction>
+
+</LinearLayout>
--- /dev/null
+<?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>
--- /dev/null
+<?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.FillLightAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_filllight"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/filllight"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.FillLightAction>
+ <com.android.gallery3d.photoeditor.actions.HighlightAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_highlight"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/highlight"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.HighlightAction>
+ <com.android.gallery3d.photoeditor.actions.ShadowAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_shadow"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/shadow"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.ShadowAction>
+ <com.android.gallery3d.photoeditor.actions.AutoFixAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_autofix"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/autofix"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.AutoFixAction>
+
+</LinearLayout>
--- /dev/null
+<?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.CropAction style="@style/Effect"
+ android:tag="@string/crop_tooltip">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_crop"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/crop"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.CropAction>
+ <com.android.gallery3d.photoeditor.actions.RedEyeAction style="@style/Effect"
+ android:tag="@string/redeye_tooltip">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_redeye"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/redeye"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.RedEyeAction>
+ <com.android.gallery3d.photoeditor.actions.StraightenAction style="@style/Effect"
+ android:tag="@string/straighten_tooltip">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_straighten"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/straighten"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.StraightenAction>
+ <com.android.gallery3d.photoeditor.actions.RotateAction style="@style/Effect"
+ android:tag="@string/rotate_tooltip">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_rotate"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/rotate"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.RotateAction>
+ <com.android.gallery3d.photoeditor.actions.FlipAction style="@style/Effect"
+ android:tag="@string/flip_tooltip">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_flip"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/flip"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.FlipAction>
+ <com.android.gallery3d.photoeditor.actions.SharpenAction style="@style/Effect">
+ <ImageButton
+ android:id="@+id/effect_button"
+ style="@style/EffectIcon"
+ android:src="@drawable/photoeditor_effect_sharpen"/>
+ <TextView
+ android:id="@+id/effect_label"
+ android:text="@string/sharpen"
+ style="@style/EffectLabel"/>
+ </com.android.gallery3d.photoeditor.actions.SharpenAction>
+
+</LinearLayout>
--- /dev/null
+<?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.
+-->
+
+<!-- The linear-layout is used to center content that cannot fill scroll-view -->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/translucent_black"
+ android:gravity="center_horizontal">
+
+ <HorizontalScrollView
+ android:id="@+id/scroll_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:scrollbars="none"/>
+</LinearLayout>
--- /dev/null
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.Toolbar
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/toolbar"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <com.android.gallery3d.photoeditor.PhotoView
+ android:id="@+id/photo_view"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"/>
+
+ <com.android.gallery3d.photoeditor.EffectsBar android:id="@+id/effects_bar" style="@style/EffectsBar">
+
+ <LinearLayout style="@style/BottomActionBar" android:gravity="center_horizontal">
+
+ <LinearLayout android:id="@+id/effects_menu" style="@style/ActionBarLinearLayout">
+
+ <ImageButton
+ android:id="@+id/exposure_button"
+ style="@style/EffectsMenuActionButton"
+ android:src="@drawable/photoeditor_exposure"/>
+ <ImageButton
+ android:id="@+id/artistic_button"
+ style="@style/EffectsMenuActionButton"
+ android:src="@drawable/photoeditor_artistic"/>
+ <ImageButton
+ android:id="@+id/color_button"
+ style="@style/EffectsMenuActionButton"
+ android:src="@drawable/photoeditor_color"/>
+ <ImageButton
+ android:id="@+id/fix_button"
+ style="@style/EffectsMenuActionButton"
+ android:src="@drawable/photoeditor_fix"/>
+ </LinearLayout>
+
+ </LinearLayout>
+ </com.android.gallery3d.photoeditor.EffectsBar>
+
+ <com.android.gallery3d.photoeditor.ActionBar android:id="@+id/action_bar" style="@style/TopActionBar">
+
+ <LinearLayout style="@style/ActionBarLinearLayout">
+
+ <LinearLayout
+ android:id="@+id/action_bar_back"
+ style="@style/ActionBarBackLinearLayout">
+ <ImageView style="@style/ActionBarArrow"/>
+ <ImageView style="@style/ActionBarIcon"/>
+ </LinearLayout>
+
+ <TextView android:id="@+id/action_bar_title" style="@style/ActionBarText"/>
+ </LinearLayout>
+
+ <LinearLayout style="@style/ActionBarLinearLayout" android:layout_alignParentRight="true">
+
+ <ImageButton
+ android:id="@+id/undo_button"
+ style="@style/ImageActionButton"
+ android:src="@drawable/photoeditor_undo"/>
+ <ImageButton
+ android:id="@+id/redo_button"
+ style="@style/ImageActionButton"
+ android:src="@drawable/photoeditor_redo"/>
+ <Button
+ android:id="@+id/save_button"
+ style="@style/TextActionButton"
+ android:text="@string/save"/>
+ </LinearLayout>
+ </com.android.gallery3d.photoeditor.ActionBar>
+</com.android.gallery3d.photoeditor.Toolbar>
--- /dev/null
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.RotateView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/fullscreen_effect_tool"
+ style="@style/FullscreenToolView"/>
--- /dev/null
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.ScaleSeekBar
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="@dimen/seekbar_width"
+ android:layout_height="@dimen/seekbar_height"
+ android:layout_marginBottom="@dimen/seekbar_margin_bottom"
+ android:minHeight="@dimen/seekbar_height"
+ android:maxHeight="@dimen/seekbar_height"
+ android:progressDrawable="@android:color/transparent"/>
--- /dev/null
+<?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.
+-->
+
+<com.android.gallery3d.photoeditor.actions.TouchView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/fullscreen_effect_tool"
+ style="@style/FullscreenToolView"/>
--- /dev/null
+<?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.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <dimen name="effect_label_text_size">11sp</dimen>
+ <dimen name="effect_label_width">98sp</dimen>
+ <dimen name="effect_icon_size">72dp</dimen>
+ <dimen name="effect_padding_left_right">2dp</dimen>
+ <dimen name="effects_container_padding">12dp</dimen>
+ <dimen name="action_bar_height">40dp</dimen>
+ <dimen name="action_bar_text_size">17sp</dimen>
+ <dimen name="action_bar_arrow_padding_top">12dp</dimen>
+ <dimen name="action_bar_arrow_padding_bottom">12dp</dimen>
+ <dimen name="action_bar_arrow_padding_left">3dp</dimen>
+ <dimen name="action_bar_arrow_padding_right">0dp</dimen>
+ <dimen name="action_bar_icon_padding_top">4dp</dimen>
+ <dimen name="action_bar_icon_padding_bottom">4dp</dimen>
+ <dimen name="action_bar_icon_padding_left">0dp</dimen>
+ <dimen name="action_bar_icon_padding_right">6dp</dimen>
+ <dimen name="action_button_padding_top">5dp</dimen>
+ <dimen name="action_button_padding_bottom">5dp</dimen>
+ <dimen name="action_button_padding_left">15dp</dimen>
+ <dimen name="action_button_padding_right">15dp</dimen>
+ <dimen name="effect_tool_panel_padding">12dp</dimen>
+ <dimen name="seekbar_width">290dp</dimen>
+ <dimen name="seekbar_height">29dp</dimen>
+ <dimen name="seekbar_margin_bottom">6dp</dimen>
+ <dimen name="crop_indicator_size">35dp</dimen>
+</resources>
--- /dev/null
+<?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.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <dimen name="effect_label_text_size">14sp</dimen>
+ <dimen name="effect_label_width">120sp</dimen>
+ <dimen name="effect_icon_size">90dp</dimen>
+ <dimen name="effect_padding_left_right">2dp</dimen>
+ <dimen name="effects_container_padding">12dp</dimen>
+ <dimen name="action_bar_height">56dp</dimen>
+ <dimen name="action_bar_text_size">18sp</dimen>
+ <dimen name="action_bar_arrow_padding_top">20dp</dimen>
+ <dimen name="action_bar_arrow_padding_bottom">20dp</dimen>
+ <dimen name="action_bar_arrow_padding_left">4dp</dimen>
+ <dimen name="action_bar_arrow_padding_right">0dp</dimen>
+ <dimen name="action_bar_icon_padding_top">7dp</dimen>
+ <dimen name="action_bar_icon_padding_bottom">7dp</dimen>
+ <dimen name="action_bar_icon_padding_left">0dp</dimen>
+ <dimen name="action_bar_icon_padding_right">8dp</dimen>
+ <dimen name="action_button_padding_top">9dp</dimen>
+ <dimen name="action_button_padding_bottom">9dp</dimen>
+ <dimen name="action_button_padding_left">22dp</dimen>
+ <dimen name="action_button_padding_right">22dp</dimen>
+ <dimen name="effect_tool_panel_padding">16dp</dimen>
+ <dimen name="seekbar_width">560dp</dimen>
+ <dimen name="seekbar_height">33dp</dimen>
+ <dimen name="seekbar_margin_bottom">8dp</dimen>
+ <dimen name="crop_indicator_size">43dp</dimen>
+</resources>
--- /dev/null
+<?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.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <dimen name="effect_label_text_size">15sp</dimen>
+ <dimen name="effect_label_width">138sp</dimen>
+ <dimen name="effect_icon_size">100dp</dimen>
+ <dimen name="effect_padding_left_right">3dp</dimen>
+ <dimen name="effects_container_padding">18dp</dimen>
+ <dimen name="action_bar_height">56dp</dimen>
+ <dimen name="action_bar_text_size">19sp</dimen>
+ <dimen name="action_bar_arrow_padding_top">20dp</dimen>
+ <dimen name="action_bar_arrow_padding_bottom">20dp</dimen>
+ <dimen name="action_bar_arrow_padding_left">4dp</dimen>
+ <dimen name="action_bar_arrow_padding_right">0dp</dimen>
+ <dimen name="action_bar_icon_padding_top">7dp</dimen>
+ <dimen name="action_bar_icon_padding_bottom">7dp</dimen>
+ <dimen name="action_bar_icon_padding_left">0dp</dimen>
+ <dimen name="action_bar_icon_padding_right">11dp</dimen>
+ <dimen name="action_button_padding_top">9dp</dimen>
+ <dimen name="action_button_padding_bottom">9dp</dimen>
+ <dimen name="action_button_padding_left">28dp</dimen>
+ <dimen name="action_button_padding_right">28dp</dimen>
+ <dimen name="effect_tool_panel_padding">18dp</dimen>
+ <dimen name="seekbar_width">560dp</dimen>
+ <dimen name="seekbar_height">35dp</dimen>
+ <dimen name="seekbar_margin_bottom">9dp</dimen>
+ <dimen name="crop_indicator_size">48dp</dimen>
+</resources>
--- /dev/null
+<?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.
+-->
+
+<resources>
+ <array name="color_picker_colors">
+ <item>@color/color_picker_preset_color1</item>
+ <item>@color/color_picker_preset_color2</item>
+ <item>@color/color_picker_preset_color3</item>
+ <item>@color/color_picker_preset_color4</item>
+ <item>@color/color_picker_preset_color5</item>
+ <item>@color/color_picker_preset_color6</item>
+ <item>@color/color_picker_preset_color7</item>
+ <item>@color/color_picker_preset_color8</item>
+ <item>@color/color_picker_preset_color9</item>
+ <item>@color/color_picker_preset_color10</item>
+ <item>@color/color_picker_preset_color11</item>
+ <item>@color/color_picker_preset_color12</item>
+ <item>@color/color_picker_preset_color13</item>
+ <item>@color/color_picker_preset_color14</item>
+ <item>@color/color_picker_preset_color15</item>
+ <item>@color/color_picker_preset_color16</item>
+ <item>@color/color_picker_preset_color17</item>
+ <item>@color/color_picker_preset_color18</item>
+ <item>@color/color_picker_preset_color19</item>
+ <item>@color/color_picker_preset_color20</item>
+ <item>@color/color_picker_preset_color21</item>
+ <item>@color/color_picker_preset_color22</item>
+ <item>@color/color_picker_preset_color23</item>
+ <item>@color/color_picker_preset_color24</item>
+ </array>
+</resources>
--- /dev/null
+<?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.
+-->
+
+<resources>
+ <color name="translucent_black">#67000000</color>
+ <color name="color_picker_preset_color1">#ddff1e00</color>
+ <color name="color_picker_preset_color2">#ddff5b00</color>
+ <color name="color_picker_preset_color3">#ddff9900</color>
+ <color name="color_picker_preset_color4">#ddffd600</color>
+ <color name="color_picker_preset_color5">#ddeaff00</color>
+ <color name="color_picker_preset_color6">#ddadff00</color>
+ <color name="color_picker_preset_color7">#dd70ff00</color>
+ <color name="color_picker_preset_color8">#dd32ff00</color>
+ <color name="color_picker_preset_color9">#dd00ff0a</color>
+ <color name="color_picker_preset_color10">#dd00ff47</color>
+ <color name="color_picker_preset_color11">#dd00ff84</color>
+ <color name="color_picker_preset_color12">#dd00ffc1</color>
+ <color name="color_picker_preset_color13">#dd00ffff</color>
+ <color name="color_picker_preset_color14">#dd00c1ff</color>
+ <color name="color_picker_preset_color15">#dd0084ff</color>
+ <color name="color_picker_preset_color16">#dd0047ff</color>
+ <color name="color_picker_preset_color17">#dd000aff</color>
+ <color name="color_picker_preset_color18">#dd3300ff</color>
+ <color name="color_picker_preset_color19">#dd7000ff</color>
+ <color name="color_picker_preset_color20">#ddad00ff</color>
+ <color name="color_picker_preset_color21">#ddea00ff</color>
+ <color name="color_picker_preset_color22">#ddff00d6</color>
+ <color name="color_picker_preset_color23">#ddff0098</color>
+ <color name="color_picker_preset_color24">#ddff005b</color>
+</resources>
--- /dev/null
+<?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.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style name="EffectIcon">
+ <item name="android:layout_width">@dimen/effect_icon_size</item>
+ <item name="android:layout_height">@dimen/effect_icon_size</item>
+ <item name="android:layout_gravity">center_horizontal</item>
+ <item name="android:scaleType">fitCenter</item>
+ <item name="android:background">@null</item>
+ </style>
+ <style name="EffectLabel">
+ <item name="android:layout_width">@dimen/effect_label_width</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_gravity">center_horizontal</item>
+ <item name="android:gravity">center</item>
+ <item name="android:textSize">@dimen/effect_label_text_size</item>
+ <item name="android:textColor">#FFFFFF</item>
+ <item name="android:maxLines">1</item>
+ <item name="android:shadowColor">#000000</item>
+ <item name="android:shadowRadius">2.0</item>
+ </style>
+ <style name="Effect">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_gravity">center_vertical</item>
+ <item name="android:paddingLeft">@dimen/effect_padding_left_right</item>
+ <item name="android:paddingRight">@dimen/effect_padding_left_right</item>
+ <item name="android:orientation">vertical</item>
+ </style>
+ <style name="EffectsContainer">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:padding">@dimen/effects_container_padding</item>
+ <item name="android:orientation">horizontal</item>
+ </style>
+ <style name="EffectsBar">
+ <item name="android:layout_width">fill_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_alignParentBottom">true</item>
+ <item name="android:orientation">vertical</item>
+ </style>
+ <style name="TopActionBar" parent="@style/ActionBar">
+ <item name="android:layout_alignParentTop">true</item>
+ <item name="android:background">@drawable/photoeditor_actionbar_translucent</item>
+ </style>
+ <style name="BottomActionBar" parent="@style/ActionBar">
+ <item name="android:background">@drawable/photoeditor_actionbar_translucent_bottom</item>
+ </style>
+ <style name="ActionBar">
+ <item name="android:layout_width">fill_parent</item>
+ <item name="android:layout_height">@dimen/action_bar_height</item>
+ </style>
+ <style name="ActionBarLinearLayout">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">fill_parent</item>
+ <item name="android:layout_centerVertical">true</item>
+ <item name="android:orientation">horizontal</item>
+ </style>
+ <style name="ActionBarBackLinearLayout" parent="@style/ActionBarLinearLayout">
+ <item name="android:clickable">true</item>
+ <item name="android:focusable">true</item>
+ <item name="android:background">?android:attr/selectableItemBackground</item>
+ </style>
+ <style name="ActionBarImageView">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">fill_parent</item>
+ <item name="android:layout_gravity">center</item>
+ <item name="android:scaleType">centerInside</item>
+ <item name="android:adjustViewBounds">true</item>
+ </style>
+ <style name="ActionBarArrow" parent="@style/ActionBarImageView">
+ <item name="android:paddingTop">@dimen/action_bar_arrow_padding_top</item>
+ <item name="android:paddingBottom">@dimen/action_bar_arrow_padding_bottom</item>
+ <item name="android:paddingLeft">@dimen/action_bar_arrow_padding_left</item>
+ <item name="android:paddingRight">@dimen/action_bar_arrow_padding_right</item>
+ <item name="android:src">@drawable/photoeditor_arrow_back</item>
+ </style>
+ <style name="ActionBarIcon" parent="@style/ActionBarImageView">
+ <item name="android:paddingTop">@dimen/action_bar_icon_padding_top</item>
+ <item name="android:paddingBottom">@dimen/action_bar_icon_padding_bottom</item>
+ <item name="android:paddingLeft">@dimen/action_bar_icon_padding_left</item>
+ <item name="android:paddingRight">@dimen/action_bar_icon_padding_right</item>
+ <item name="android:src">@mipmap/ic_launcher_gallery</item>
+ </style>
+ <style name="ActionBarText">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_gravity">center</item>
+ <item name="android:textSize">@dimen/action_bar_text_size</item>
+ <item name="android:textColor">#FFFFFF</item>
+ </style>
+ <style name="ImageActionButton" parent="@style/ActionBarImageView">
+ <item name="android:paddingTop">@dimen/action_button_padding_top</item>
+ <item name="android:paddingBottom">@dimen/action_button_padding_bottom</item>
+ <item name="android:paddingLeft">@dimen/action_button_padding_left</item>
+ <item name="android:paddingRight">@dimen/action_button_padding_right</item>
+ <item name="android:background">?android:attr/selectableItemBackground</item>
+ </style>
+ <style name="TextActionButton" parent="@style/ActionBarText">
+ <item name="android:paddingLeft">@dimen/action_button_padding_left</item>
+ <item name="android:paddingRight">@dimen/action_button_padding_right</item>
+ <item name="android:background">?android:attr/selectableItemBackground</item>
+ </style>
+ <style name="EffectsMenuActionButton" parent="@style/ImageActionButton">
+ <item name="android:background">@drawable/photoeditor_toggle_button_background</item>
+ </style>
+ <style name="FullscreenToolView">
+ <item name="android:layout_width">fill_parent</item>
+ <item name="android:layout_height">fill_parent</item>
+ </style>
+ <style name="SpinnerProgressDialog">
+ <item name="android:background">@android:color/transparent</item>
+ <item name="android:windowBackground">@android:color/transparent</item>
+ <item name="android:windowFrame">@null</item>
+ <item name="android:windowTitleStyle">@null</item>
+ <item name="android:windowIsFloating">true</item>
+ <item name="android:backgroundDimEnabled">false</item>
+ </style>
+</resources>
--- /dev/null
+/*
+ * 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.
+ */
+
+package com.android.gallery3d.photoeditor;
+
+import android.app.Dialog;
+import android.view.MotionEvent;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.ProgressBar;
+
+import com.android.gallery3d.R;
+
+/**
+ * Spinner model progress dialog that disables all tools for user interaction after it shows up and
+ * and re-enables them after it dismisses.
+ */
+public class SpinnerProgressDialog extends Dialog {
+
+ private final ViewGroup tools;
+
+ public static SpinnerProgressDialog show(ViewGroup tools) {
+ SpinnerProgressDialog dialog = new SpinnerProgressDialog(tools);
+ dialog.setCancelable(false);
+ dialog.show();
+ return dialog;
+ }
+
+ private SpinnerProgressDialog(ViewGroup tools) {
+ super(tools.getContext(), R.style.SpinnerProgressDialog);
+
+ addContentView(new ProgressBar(tools.getContext()), new LayoutParams(
+ LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+
+ this.tools = tools;
+ enableTools(false);
+ }
+
+ @Override
+ public void dismiss() {
+ super.dismiss();
+
+ enableTools(true);
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ super.onTouchEvent(event);
+
+ // Pass touch events to tools for killing idle even when the progress dialog is shown.
+ return tools.dispatchTouchEvent(event);
+ }
+
+ private void enableTools(boolean enabled) {
+ for (int i = 0; i < tools.getChildCount(); i++) {
+ tools.getChildAt(i).setEnabled(enabled);
+ }
+ }
+}
OSDN Git Service
