<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
+<!--
+ Copyright (C) 2012 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.
android:id="@+id/imageStatePanel"
android:layout_width="200dip"
android:layout_height="match_parent"
+ android:layout_gravity="right"
android:orientation="vertical"
- android:visibility="invisible"
- android:layout_gravity="right">
+ android:visibility="invisible" >
<TextView
android:layout_width="match_parent"
android:id="@+id/historyPanel"
android:layout_width="200dip"
android:layout_height="match_parent"
+ android:layout_gravity="right"
android:orientation="vertical"
- android:visibility="invisible"
- android:layout_gravity="right">
+ android:visibility="invisible" >
<TextView
android:layout_width="match_parent"
android:orientation="horizontal" >
<Button
- android:gravity="center"
android:id="@+id/resetOperationsButton"
style="@style/FilterShowHistoryButton"
+ android:gravity="center"
android:text="@string/reset" />
<Button
android:id="@+id/saveOperationsButton"
style="@style/FilterShowHistoryButton"
- android:visibility="gone"
- android:text="@string/save" />
+ android:text="@string/save"
+ android:visibility="gone" />
</LinearLayout>
</LinearLayout>
android:layout_height="wrap_content"
android:visibility="gone" />
+ <!--
<ImageButton
android:id="@+id/showOriginalButton"
android:layout_width="64dip"
android:layout_gravity="bottom"
android:scaleType="centerInside"
android:src="@drawable/filtershow_button_show_original" />
+ -->
+ <SeekBar
+ android:id="@+id/filterSeekBar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:padding="16dip"
+ android:visibility="gone" />
</FrameLayout>
- <HorizontalScrollView
- android:id="@+id/fxList"
- android:layout_width="match_parent"
- android:layout_height="96dip" >
-
- <LinearLayout
- android:id="@+id/listFilters"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:orientation="horizontal" >
- </LinearLayout>
- </HorizontalScrollView>
-
- <HorizontalScrollView
- android:id="@+id/bordersList"
- android:layout_width="match_parent"
- android:layout_height="96dip"
- android:visibility="gone" >
-
- <LinearLayout
- android:id="@+id/listBorders"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:orientation="horizontal" >
- </LinearLayout>
- </HorizontalScrollView>
-
- <HorizontalScrollView
- android:id="@+id/gemoetryList"
+ <FrameLayout
+ android:id="@+id/secondRowPanel"
android:layout_width="fill_parent"
- android:layout_height="96dip"
- android:background="@color/background_toolbar"
- android:visibility="gone" >
+ android:layout_height="wrap_content" >
<LinearLayout
- android:id="@+id/listGeometry"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:orientation="horizontal" >
+ android:id="@+id/filterButtonsList"
+ android:layout_width="fill_parent"
+ android:layout_height="96dip"
+ android:background="@color/background_toolbar"
+ android:orientation="horizontal"
+ android:visibility="gone" >
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/straightenButton"
+ android:id="@+id/compareWithOriginalImage"
style="@style/FilterShowBottomButton"
+ android:layout_gravity="left"
+ android:layout_weight="0"
android:src="@drawable/filtershow_button_geometry_straighten"
- android:text="@string/straighten" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/cropButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_geometry_crop"
- android:text="@string/crop" />
+ android:text="@string/compare_original" />
+
+ <Button
+ android:id="@+id/applyEffect"
+ android:layout_height="94dip"
+ android:layout_gravity="center"
+ android:layout_weight="1"
+ android:background="@android:color/transparent"
+ android:gravity="center"
+ android:text="@string/apply_effect"
+ android:textSize="24dip" />
<com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/rotateButton"
+ android:id="@+id/resetEffect"
style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_geometry_rotate"
- android:text="@string/rotate" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/flipButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_geometry_flip"
- android:text="@string/flip" />
+ android:layout_gravity="right"
+ android:layout_weight="0"
+ android:src="@drawable/filtershow_button_geometry_straighten"
+ android:text="@string/reset_effect" />
</LinearLayout>
- </HorizontalScrollView>
- <HorizontalScrollView
- android:id="@+id/colorsFxList"
- android:layout_width="fill_parent"
- android:layout_height="96dip"
- android:background="@color/background_toolbar"
- android:visibility="gone" >
-
- <LinearLayout
- android:id="@+id/listColorsFx"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal" >
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/vignetteButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_vignette"
- android:text="@string/vignette" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/exposureButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/exposure" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/contrastButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/contrast" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/saturationButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/saturation" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/tintButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/tint" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/curvesButtonRGB"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_curve"
- android:text="@string/curvesRGB" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/vibranceButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/vibrance" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/sharpenButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_sharpen"
- android:text="@string/sharpen" />
-
- <com.android.gallery3d.filtershow.ui.ImageButtonTitle
- android:id="@+id/shadowRecoveryButton"
- style="@style/FilterShowBottomButton"
- android:src="@drawable/filtershow_button_colors_contrast"
- android:text="@string/shadow_recovery" />
-
- </LinearLayout>
- </HorizontalScrollView>
+ <HorizontalScrollView
+ android:id="@+id/fxList"
+ android:layout_width="match_parent"
+ android:layout_height="96dip">
+
+ <LinearLayout
+ android:id="@+id/listFilters"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="horizontal" >
+ </LinearLayout>
+ </HorizontalScrollView>
+
+ <HorizontalScrollView
+ android:id="@+id/bordersList"
+ android:layout_width="match_parent"
+ android:layout_height="96dip"
+ android:visibility="gone" >
+
+ <LinearLayout
+ android:id="@+id/listBorders"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="horizontal" >
+ </LinearLayout>
+ </HorizontalScrollView>
+
+ <HorizontalScrollView
+ android:id="@+id/geometryList"
+ android:layout_width="fill_parent"
+ android:layout_height="96dip"
+ android:background="@color/background_toolbar"
+ android:visibility="gone" >
+
+ <LinearLayout
+ android:id="@+id/listGeometry"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:orientation="horizontal" >
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/straightenButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_geometry_straighten"
+ android:text="@string/straighten" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/cropButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_geometry_crop"
+ android:text="@string/crop" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/rotateButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_geometry_rotate"
+ android:text="@string/rotate" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/flipButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_geometry_flip"
+ android:text="@string/flip" />
+ </LinearLayout>
+ </HorizontalScrollView>
+
+ <HorizontalScrollView
+ android:id="@+id/colorsFxList"
+ android:layout_width="fill_parent"
+ android:layout_height="96dip"
+ android:background="@color/background_toolbar"
+ android:visibility="gone" >
+
+ <LinearLayout
+ android:id="@+id/listColorsFx"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal" >
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/exposureButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_contrast"
+ android:text="@string/exposure" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/vibranceButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_contrast"
+ android:text="@string/vibrance" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/saturationButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_contrast"
+ android:text="@string/saturation" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/contrastButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_contrast"
+ android:text="@string/contrast" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/shadowRecoveryButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_contrast"
+ android:text="@string/shadow_recovery" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/vignetteButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_vignette"
+ android:text="@string/vignette" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/sharpenButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_sharpen"
+ android:text="@string/sharpen" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/tintButton"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_contrast"
+ android:text="@string/tint" />
+
+ <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+ android:id="@+id/curvesButtonRGB"
+ style="@style/FilterShowBottomButton"
+ android:src="@drawable/filtershow_button_colors_curve"
+ android:text="@string/curvesRGB" />
+
+ </LinearLayout>
+ </HorizontalScrollView>
+ </FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_weight="1"
android:background="@drawable/filtershow_button_background"
android:scaleType="centerInside"
- android:src="@drawable/filtershow_button_fx" />
+ android:src="@drawable/ic_photoeditor_effects" />
<ImageButton
android:id="@+id/borderButton"
android:background="@drawable/filtershow_button_background"
android:padding="2dip"
android:scaleType="centerInside"
- android:src="@drawable/filtershow_button_border" />
+ android:src="@drawable/ic_photoeditor_border" />
<ImageButton
android:id="@+id/geometryButton"
android:background="@drawable/filtershow_button_background"
android:padding="2dip"
android:scaleType="centerInside"
- android:src="@drawable/filtershow_button_geometry" />
+ android:src="@drawable/ic_photoeditor_fix" />
<ImageButton
android:id="@+id/colorsButton"
android:background="@drawable/filtershow_button_background"
android:padding="2dip"
android:scaleType="centerInside"
- android:src="@drawable/filtershow_button_colors" />
+ android:src="@drawable/ic_photoeditor_color" />
</LinearLayout>
</LinearLayout>