New UI... (92e23412) · Commits · e / os / android_packages_apps_Gallery2

res/layout/filtershow_activity.xml

+186 −135

Original line number	Diff line number	Diff line
		<?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.
		@@ -22,9 +23,9 @@
		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"
		@@ -49,9 +50,9 @@
		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"
		@@ -77,16 +78,16 @@
		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>

		@@ -131,6 +132,7 @@
		android:layout_height="wrap_content"
		android:visibility="gone" />

		<!--
		<ImageButton
		android:id="@+id/showOriginalButton"
		android:layout_width="64dip"
		@@ -138,8 +140,56 @@
		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>

		<FrameLayout
		android:id="@+id/secondRowPanel"
		android:layout_width="fill_parent"
		android:layout_height="wrap_content" >

		<LinearLayout
		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/compareWithOriginalImage"
		style="@style/FilterShowBottomButton"
		android:layout_gravity="left"
		android:layout_weight="0"
		android:src="@drawable/filtershow_button_geometry_straighten"
		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/resetEffect"
		style="@style/FilterShowBottomButton"
		android:layout_gravity="right"
		android:layout_weight="0"
		android:src="@drawable/filtershow_button_geometry_straighten"
		android:text="@string/reset_effect" />
		</LinearLayout>

		<HorizontalScrollView
		android:id="@+id/fxList"
		android:layout_width="match_parent"
		@@ -168,7 +218,7 @@
		</HorizontalScrollView>

		<HorizontalScrollView
		android:id="@+id/gemoetryList"
		android:id="@+id/geometryList"
		android:layout_width="fill_parent"
		android:layout_height="96dip"
		android:background="@color/background_toolbar"
		@@ -219,12 +269,6 @@
		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"
		@@ -232,10 +276,10 @@
		android:text="@string/exposure" />

		<com.android.gallery3d.filtershow.ui.ImageButtonTitle
		android:id="@+id/contrastButton"
		android:id="@+id/vibranceButton"
		style="@style/FilterShowBottomButton"
		android:src="@drawable/filtershow_button_colors_contrast"
		android:text="@string/contrast" />
		android:text="@string/vibrance" />

		<com.android.gallery3d.filtershow.ui.ImageButtonTitle
		android:id="@+id/saturationButton"
		@@ -244,22 +288,22 @@
		android:text="@string/saturation" />

		<com.android.gallery3d.filtershow.ui.ImageButtonTitle
		android:id="@+id/tintButton"
		android:id="@+id/contrastButton"
		style="@style/FilterShowBottomButton"
		android:src="@drawable/filtershow_button_colors_contrast"
		android:text="@string/tint" />
		android:text="@string/contrast" />

		<com.android.gallery3d.filtershow.ui.ImageButtonTitle
		android:id="@+id/curvesButtonRGB"
		android:id="@+id/shadowRecoveryButton"
		style="@style/FilterShowBottomButton"
		android:src="@drawable/filtershow_button_colors_curve"
		android:text="@string/curvesRGB" />
		android:src="@drawable/filtershow_button_colors_contrast"
		android:text="@string/shadow_recovery" />

		<com.android.gallery3d.filtershow.ui.ImageButtonTitle
		android:id="@+id/vibranceButton"
		android:id="@+id/vignetteButton"
		style="@style/FilterShowBottomButton"
		android:src="@drawable/filtershow_button_colors_contrast"
		android:text="@string/vibrance" />
		android:src="@drawable/filtershow_button_colors_vignette"
		android:text="@string/vignette" />

		<com.android.gallery3d.filtershow.ui.ImageButtonTitle
		android:id="@+id/sharpenButton"
		@@ -268,13 +312,20 @@
		android:text="@string/sharpen" />

		<com.android.gallery3d.filtershow.ui.ImageButtonTitle
		android:id="@+id/shadowRecoveryButton"
		android:id="@+id/tintButton"
		style="@style/FilterShowBottomButton"
		android:src="@drawable/filtershow_button_colors_contrast"
		android:text="@string/shadow_recovery" />
		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"
		@@ -288,7 +339,7 @@
		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"
		@@ -298,7 +349,7 @@
		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"
		@@ -308,7 +359,7 @@
		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"
		@@ -318,7 +369,7 @@
		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>

res/values/filtershow_strings.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,15 @@
		<!-- Text for the image state panel title [CHAR LIMIT=50] -->
		<string name="imageState">Current Image State</string>

		<!-- Additional filters buttons -->

		<!-- Label for the compare original image filter button [CHAR LIMIT=15] -->
		<string name="compare_original">Compare</string>
		<!-- Label for the apply effect button [CHAR LIMIT=15] -->
		<string name="apply_effect">Apply</string>
		<!-- Label for the reset effect button [CHAR LIMIT=15] -->
		<string name="reset_effect">Reset</string>

		<!-- Filters buttons -->

		<!-- Label for the exposure filter button [CHAR LIMIT=15] -->

res/values/filtershow_styles.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@
		</style>

		<style name="FilterShowBottomButton">
		<item name="android:layout_width">wrap_content</item>
		<item name="android:layout_width">96dip</item>
		<item name="android:layout_height">wrap_content</item>
		<item name="android:background">@drawable/filtershow_button_background</item>
		<item name="android:gravity">center</item>

src/com/android/gallery3d/filtershow/FilterShowActivity.java

+94 −445

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/gallery3d/filtershow/PanelController.java

0 → 100644

+474 −0

File added.

Preview size limit exceeded, changes collapsed.