Gallery: UX enhancement

Added new resources and modified source
to enhance the UI of Gallery application.

CRs-Fixed: 926603

Change-Id: I5ca7c49115ab4a3531b72a53380bb765d52707a2

5 files changed, 332 insertions, 284 deletions

diff --git a/res/layout-land/filtershow_activity.xml b/res/layout-land/filtershow_activity.xml
index f4380126e..35914a47f 100644
--- a/res/layout-land/filtershow_activity.xml
+++ b/res/layout-land/filtershow_activity.xml
@@ -16,99 +16,85 @@
 -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:id="@+id/mainView"
-             android:background="@drawable/filtershow_tiled_background">
+    android:id="@+id/mainView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:animateLayoutChanges="true">
-
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:animateLayoutChanges="true"
+        android:orientation="horizontal" >
 
         <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1" >
+
+            <ProgressBar
+                android:id="@+id/loading"
+                style="@android:style/Widget.Holo.ProgressBar.Large"
                 android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:background="@null"
+                android:indeterminate="true"
+                android:indeterminateOnly="true" />
+
+            <RelativeLayout
+                android:id="@+id/imageContainer"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1">
+                android:layout_weight="1"
+                android:orientation="horizontal" >
 
-            <ProgressBar
-                    android:id="@+id/loading"
-                    style="@android:style/Widget.Holo.ProgressBar.Large"
-                    android:layout_width="wrap_content"
+                <FrameLayout
+                    android:id="@+id/editorContainer"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:indeterminate="true"
-                    android:indeterminateOnly="true"
-                    android:background="@null"/>
-
-            <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:orientation="vertical"
-                    >
-
-                <LinearLayout
-                        android:layout_weight="1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="0dp"
-                        android:orientation="horizontal">
-
-                    <FrameLayout
-                            android:id="@+id/central_panel_container"
-                            android:layout_gravity="center"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:visibility="gone"/>
-
-                    <FrameLayout
-                            android:id="@+id/editorContainer"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"/>
-
-                    <com.android.gallery3d.filtershow.imageshow.ImageShow
-                            android:id="@+id/imageShow"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"/>
+                    android:visibility="gone" />
 
-                </LinearLayout>
-
-                <FrameLayout
-                        android:id="@+id/state_panel_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:visibility="visible"/>
-
-            </LinearLayout>
+                <com.android.gallery3d.filtershow.imageshow.ImageShow
+                    android:id="@+id/imageShow"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1" />
 
-        </FrameLayout>
+                <ImageButton
+                    android:id="@+id/imgComparison"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginTop="100dp"
+                    android:background="@android:color/transparent"
+                    android:src="@drawable/comparison_before"
+                    android:visibility="visible" />
+            </RelativeLayout>
 
-        <LinearLayout
+            <LinearLayout
                 android:id="@+id/mainPanel"
-                android:layout_width="350dip"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:animateLayoutChanges="true">
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_gravity="center|bottom"
+                android:animateLayoutChanges="true"
+                android:orientation="vertical" >
 
-            <FrameLayout
+                <FrameLayout
                     android:id="@+id/main_panel_container"
-                    android:layout_width="350dip"
+                    android:layout_width="match_parent"
                     android:layout_height="0dip"
-                    android:layout_weight="1"/>
-
-        </LinearLayout>
-
+                    android:layout_gravity="center"
+                    android:layout_weight="1" />
+            </LinearLayout>
+        </FrameLayout>
     </LinearLayout>
 
     <com.android.gallery3d.filtershow.category.CategorySelected
-            android:layout_width="@dimen/category_panel_icon_size"
-            android:layout_height="@dimen/category_panel_icon_size"
-            android:id="@+id/categorySelectedIndicator"
-            android:visibility="invisible"/>
+        android:id="@+id/categorySelectedIndicator"
+        android:layout_width="@dimen/category_panel_icon_size"
+        android:layout_height="@dimen/category_panel_icon_size"
+        android:visibility="gone" />
 
-</FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout-land/filtershow_category_panel_new.xml b/res/layout-land/filtershow_category_panel_new.xml
index ad85f7174..26b92e769 100644
--- a/res/layout-land/filtershow_category_panel_new.xml
+++ b/res/layout-land/filtershow_category_panel_new.xml
@@ -16,24 +16,48 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+    xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/edit_actionbar_background"
+    android:orientation="horizontal" >
 
-    <com.android.gallery3d.filtershow.category.IconView
-            android:id="@+id/addButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/category_panel_height"
-            android:src="@drawable/filtershow_add"/>
+    <!-- <com.android.gallery3d.filtershow.category.IconView -->
+    <!-- android:id="@+id/addButton" -->
+    <!-- android:layout_width="match_parent" -->
+    <!-- android:layout_height="@dimen/category_panel_height" -->
+    <!-- android:src="@drawable/filtershow_add"/> -->
+
+
+    <!-- <ListView -->
+    <!-- android:id="@+id/listItems" -->
+    <!-- android:orientation="vertical" -->
+    <!-- android:layout_width="match_parent" -->
+    <!-- android:layout_height="@dimen/category_panel_height" -->
+    <!-- android:layout_margin="8dip" -->
+    <!-- android:divider="@android:color/transparent" -->
+    <!-- android:dividerHeight="8dip" -->
+    <!-- android:layout_weight="1"/> -->
 
-    <ListView
+    <HorizontalScrollView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:scrollbars="none" >
+
+        <com.android.gallery3d.filtershow.category.CategoryTrack
             android:id="@+id/listItems"
-            android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_margin="8dip"
+            android:layout_height="@dimen/category_panel_height"
             android:divider="@android:color/transparent"
-            android:dividerHeight="8dip"
-            android:layout_weight="1"/>
+            android:dividerPadding="8dip"
+            custom:iconSize="@dimen/category_panel_icon_size" />
+    </HorizontalScrollView>
+
+    <com.android.gallery3d.filtershow.category.IconView
+        android:id="@+id/addButton"
+        android:layout_width="@dimen/category_panel_height"
+        android:layout_height="@dimen/category_panel_height"
+        android:src="@drawable/filtershow_add" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/filtershow_editor_panel.xml b/res/layout-land/filtershow_editor_panel.xml
index f51dc14d0..59885e0f0 100644
--- a/res/layout-land/filtershow_editor_panel.xml
+++ b/res/layout-land/filtershow_editor_panel.xml
@@ -16,124 +16,97 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/top"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-              android:visibility="visible">
-
-    <RelativeLayout
+    android:id="@+id/top"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:visibility="visible" >
+
+    <!-- <RelativeLayout -->
+    <!-- android:layout_width="match_parent" -->
+    <!-- android:layout_height="match_parent" > -->
+
+    <Button
+        android:id="@+id/toggle_state"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:background="@color/background_main_toolbar"
+        android:text="@string/imageState"
+        android:visibility="gone" />
+
+    <!-- <LinearLayout -->
+    <!-- android:id="@+id/applyBar" -->
+    <!-- android:layout_width="match_parent" -->
+    <!-- android:layout_height="48dip" -->
+    <!-- android:layout_above="@id/bottomControlLineBottom" -->
+    <!-- android:background="@color/background_main_toolbar" -->
+    <!-- android:baselineAligned="false" -->
+    <!-- android:orientation="horizontal" -->
+    <!-- android:visibility="visible" > -->
+
+
+    <!-- <ImageButton -->
+    <!-- android:id="@+id/cancelFilter" -->
+    <!-- android:layout_width="wrap_content" -->
+    <!-- android:layout_height="fill_parent" -->
+    <!-- android:layout_gravity="left|center_vertical" -->
+    <!-- android:layout_weight=".1" -->
+    <!-- android:background="@android:color/transparent" -->
+    <!-- android:gravity="center" -->
+    <!-- android:src="@drawable/ic_menu_cancel_holo_light" -->
+    <!-- android:textSize="18dip" /> -->
+
+
+    <!-- <LinearLayout -->
+    <!-- android:id="@+id/panelAccessoryViewList" -->
+    <!-- android:layout_width="wrap_content" -->
+    <!-- android:layout_height="match_parent" -->
+    <!-- android:layout_weight="1" -->
+    <!-- android:orientation="horizontal" -->
+    <!-- android:visibility="visible" > -->
+
+
+    <!-- <com.android.gallery3d.filtershow.editors.SwapButton -->
+    <!-- android:id="@+id/applyEffect" -->
+    <!-- android:layout_width="fill_parent" -->
+    <!-- android:layout_height="fill_parent" -->
+    <!-- android:layout_gravity="center" -->
+    <!-- android:background="@android:color/transparent" -->
+    <!-- android:drawableEnd="@drawable/filtershow_menu_marker_rtl" -->
+    <!-- android:text="@string/apply_effect" -->
+    <!-- android:textSize="18dip" /> -->
+    <!-- </LinearLayout> -->
+
+
+    <!-- <ImageButton -->
+    <!-- android:id="@+id/applyFilter" -->
+    <!-- android:layout_width="wrap_content" -->
+    <!-- android:layout_height="fill_parent" -->
+    <!-- android:layout_gravity="right|center_vertical" -->
+    <!-- android:layout_weight=".1" -->
+    <!-- android:background="@android:color/transparent" -->
+    <!-- android:gravity="center" -->
+    <!-- android:src="@drawable/ic_menu_done_holo_light" -->
+    <!-- android:textSize="18dip" /> -->
+    <!-- </LinearLayout> -->
+
+    <LinearLayout
+        android:id="@+id/controlArea"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="bottom"
+        android:orientation="horizontal"
+        android:visibility="visible" >
+
+        <SeekBar
+            android:id="@+id/primarySeekBar"
+            style="@style/FilterShowSlider"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            >
-
-        <Button
-                android:id="@+id/toggle_state"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/imageState"
-                android:background="@color/background_main_toolbar"
-                android:layout_alignParentTop="true"
-                />
-
-        <View
-                android:id="@+id/bottomControlLineBottom"
-                android:background="@color/toolbar_separation_line"
-                android:layout_height="1dip"
-                android:layout_width="match_parent"
-                android:layout_alignParentBottom="true"
-                />
-        <LinearLayout
-                android:id="@+id/applyBar"
-                android:layout_width="match_parent"
-                android:layout_height="48dip"
-                android:background="@color/background_main_toolbar"
-                android:orientation="horizontal"
-                android:baselineAligned="false"
-                android:visibility="visible"
-                android:layout_above="@id/bottomControlLineBottom"
-                >
-
-            <ImageButton
-                    android:id="@+id/cancelFilter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
-                    android:layout_gravity="left|center_vertical"
-                    android:background="@android:color/transparent"
-                    android:layout_weight=".1"
-                    android:gravity="center"
-                    android:src="@drawable/ic_menu_cancel_holo_light"
-                    android:textSize="18dip"/>
-
-            <ImageView
-                    android:layout_width="2dp"
-                    android:layout_height="fill_parent"
-                    android:src="@drawable/filtershow_vertical_bar"/>
-
-            <LinearLayout
-                    android:id="@+id/panelAccessoryViewList"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="horizontal"
-                    android:visibility="visible">
-
-                <com.android.gallery3d.filtershow.editors.SwapButton
-                        android:id="@+id/applyEffect"
-                        android:layout_width="fill_parent"
-                        android:layout_height="fill_parent"
-                        android:layout_gravity="center"
-                        android:background="@android:color/transparent"
-                        android:text="@string/apply_effect"
-                        android:textSize="18dip"
-                        android:drawableEnd="@drawable/filtershow_menu_marker_rtl"
-                        android:textAllCaps="true"/>
-
-            </LinearLayout>
-
-            <ImageView
-                    android:layout_width="2dp"
-                    android:layout_height="fill_parent"
-                    android:src="@drawable/filtershow_vertical_bar"/>
-
-            <ImageButton
-                    android:id="@+id/applyFilter"
-                    android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
-                    android:layout_gravity="right|center_vertical"
-                    android:layout_weight=".1"
-                    android:background="@android:color/transparent"
-                    android:gravity="center"
-                    android:src="@drawable/ic_menu_done_holo_light"
-                    android:textSize="18dip"/>
-        </LinearLayout>
-        <View
-                android:id="@+id/bottomControlLineTop"
-                android:background="@color/toolbar_separation_line"
-                android:layout_height="1dip"
-                android:layout_width="match_parent"
-                android:layout_above="@id/applyBar"
-                />
-
-        <LinearLayout
-                android:id="@+id/controlArea"
-                android:layout_width="match_parent"
-                android:layout_height="fill_parent"
-                android:orientation="vertical"
-                android:layout_above="@id/bottomControlLineTop"
-                android:layout_below="@id/toggle_state"
-                android:gravity="bottom"
-                android:visibility="visible">
-
-            <SeekBar
-                    android:id="@+id/primarySeekBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    style="@style/FilterShowSlider"
-                    android:visibility="gone"/>
-
-        </LinearLayout>
-
-    </RelativeLayout>
-</LinearLayout>
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:visibility="gone" />
+    </LinearLayout>
+    <!-- </RelativeLayout> -->
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/filtershow_grad_ui.xml b/res/layout-land/filtershow_grad_ui.xml
index 71aa22ac5..7cc874c60 100644
--- a/res/layout-land/filtershow_grad_ui.xml
+++ b/res/layout-land/filtershow_grad_ui.xml
@@ -118,7 +118,7 @@
             android:scaleType="centerInside"
             android:layout_weight="0"
             android:background="@drawable/filtershow_button_background"
-            android:src="@drawable/filtershow_addpoint"
+            android:src="@drawable/addspot"
             android:paddingBottom="8dp"
             android:layout_marginStart="48dp" />
 
@@ -136,7 +136,7 @@
             android:scaleType="centerInside"
             android:layout_weight="0"
             android:background="@drawable/filtershow_button_background"
-            android:src="@drawable/ic_menu_trash_holo_light"
+            android:src="@drawable/delete"
             android:paddingBottom="8dp"
             android:layout_marginEnd="48dp" />
 
diff --git a/res/layout-land/filtershow_main_panel.xml b/res/layout-land/filtershow_main_panel.xml
index 2202f102c..2d20df12e 100644
--- a/res/layout-land/filtershow_main_panel.xml
+++ b/res/layout-land/filtershow_main_panel.xml
@@ -16,100 +16,165 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:baselineAligned="false"
-              android:orientation="vertical"
-              android:animateLayoutChanges="true"
-              android:visibility="visible" >
-
-    <FrameLayout android:id="@+id/category_panel_container"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dip"
-                 android:layout_weight="1"/>
-
-    <View
-            android:background="@color/toolbar_separation_line"
-            android:layout_height="1dip"
-            android:layout_width="match_parent"/>
+    android:layout_width="match_parent"
+    android:layout_height="80dp"
+    android:animateLayoutChanges="true"
+    android:baselineAligned="false"
+    android:orientation="vertical"
+    android:visibility="visible" >
+
 
     <com.android.gallery3d.filtershow.CenteredLinearLayout
-            xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
+        xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center|bottom"
+        android:orientation="vertical"
+        android:background="@color/edit_actionbar_background"
+        custom:max_width="400dip" >
+
+        <FrameLayout
+            android:id="@+id/category_panel_container"
             android:layout_width="match_parent"
-            android:layout_height="48dip"
-            android:layout_gravity="center|bottom"
-            custom:max_width="400dip"
-            android:orientation="vertical">
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:visibility="gone" />
 
-        <LinearLayout android:layout_width="wrap_content"
-                      android:layout_height="match_parent"
-                      android:background="@color/background_main_toolbar">
+        <LinearLayout
+            android:id="@+id/effectsContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="10dp" >
 
             <ImageButton
-                    android:id="@+id/fxButton"
-                    android:layout_width="@dimen/thumbnail_size"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@drawable/filtershow_button_background"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/ic_photoeditor_effects"/>
+                android:id="@+id/fxButton"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:scaleType="centerInside"
+                android:src="@drawable/color" />
 
             <ImageButton
-                    android:id="@+id/borderButton"
-                    android:layout_width="@dimen/thumbnail_size"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@drawable/filtershow_button_background"
-                    android:padding="2dip"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/ic_photoeditor_border"/>
+                android:id="@+id/borderButton"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:padding="2dip"
+                android:scaleType="centerInside"
+                android:src="@drawable/frames" />
 
             <ImageButton
-                    android:id="@+id/geometryButton"
-                    android:layout_width="@dimen/thumbnail_size"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@drawable/filtershow_button_background"
-                    android:padding="2dip"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/ic_photoeditor_fix"/>
+                android:id="@+id/geometryButton"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:padding="2dip"
+                android:scaleType="centerInside"
+                android:src="@drawable/crop" />
 
             <ImageButton
-                    android:id="@+id/colorsButton"
-                    android:layout_width="@dimen/thumbnail_size"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@drawable/filtershow_button_background"
-                    android:padding="2dip"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/ic_photoeditor_color"/>
+                android:id="@+id/colorsButton"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:padding="2dip"
+                android:scaleType="centerInside"
+                android:src="@drawable/exposure" />
+
             <ImageButton
-                    android:id="@+id/makeupButton"
-                    android:layout_width="@dimen/thumbnail_size"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@drawable/filtershow_button_background"
-                    android:padding="2dip"
-                    android:scaleType="centerInside"
-                    android:visibility="gone"
-                    android:src="@drawable/ic_photoeditor_makeup"/>
+                android:id="@+id/makeupButton"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:padding="2dip"
+                android:scaleType="centerInside"
+                android:src="@drawable/beautify"
+                android:visibility="gone" />
             <ImageButton
                     android:id="@+id/dualCamButton"
                     android:layout_width="@dimen/thumbnail_size"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/filtershow_button_background"
+                    android:background="@android:color/transparent"
                     android:padding="2dip"
                     android:scaleType="centerInside"
-                    android:src="@drawable/ic_photoeditor_dualcam"/>
-
+                    android:src="@drawable/dualcamera"/>
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/effectsText"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingTop="5dp" >
+
+            <TextView
+                android:id="@+id/tvColor"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@string/color"
+                android:textColor="#ffffff"
+                android:gravity="center"
+                android:textSize="@dimen/edit_main_font" />
+
+            <TextView
+                android:id="@+id/tvFrames"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@string/frames"
+                android:textColor="#ffffff"
+                android:gravity="center"
+                android:textSize="@dimen/edit_main_font" />
+
+            <TextView
+                android:id="@+id/tvCrop"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:paddingLeft="12dp"
+                android:text="@string/crop"
+                android:textColor="#ffffff"
+                android:gravity="center"
+                android:textSize="@dimen/edit_main_font" />
+
+            <TextView
+                android:id="@+id/tvExposure"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@string/exposure"
+                android:textColor="#ffffff"
+                android:gravity="center"
+                android:textSize="@dimen/edit_main_font" />
+
+            <TextView
+                android:id="@+id/tvBeautify"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@string/beautify"
+                android:textColor="#ffffff"
+                android:gravity="center"
+                android:textSize="@dimen/edit_main_font"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/tvDualCam"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/dualcam"
+                android:gravity="center"
+                android:textColor="#ffffff"
+                android:textSize="@dimen/edit_main_font"
+                android:visibility="gone" />
+        </LinearLayout>
     </com.android.gallery3d.filtershow.CenteredLinearLayout>
 
-    <View
-            android:background="@color/toolbar_separation_line"
-            android:layout_height="1dip"
-            android:layout_width="match_parent"/>
-
 </LinearLayout>
\ No newline at end of file