Gallery: UX enhancement

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

CRs-Fixed: 926603

Change-Id: I5ca7c49115ab4a3531b72a53380bb765d52707a2

23 files changed, 708 insertions, 371 deletions

diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml
index c3a5a774a..a8f5fc2e7 100644
--- a/res/layout/action_mode.xml
+++ b/res/layout/action_mode.xml
@@ -32,7 +32,8 @@
                 style="?android:attr/actionButtonStyle"
                 android:divider="?android:attr/listDividerAlertDialog"
                 android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
-                android:textColor="?android:attr/actionMenuTextColor"
+                android:textColor="#8A000000"
+                android:textSize="20sp"
                 android:singleLine="true"
                 android:gravity="left|center_vertical"
                 android:paddingEnd="25dip"
diff --git a/res/layout/details.xml b/res/layout/details.xml
index 1fea0a0fb..0c3622bcf 100644
--- a/res/layout/details.xml
+++ b/res/layout/details.xml
@@ -18,6 +18,7 @@
     android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textSize="16sp"
+    android:textColor="@color/albumset_label_background"
     android:gravity="start"
 />
diff --git a/res/layout/details_list.xml b/res/layout/details_list.xml
index b80ab6ca8..aa5842c7b 100644
--- a/res/layout/details_list.xml
+++ b/res/layout/details_list.xml
@@ -17,6 +17,9 @@
 <ListView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp"
+    android:paddingTop="20dp"
+    android:paddingBottom="16dp"
+    android:paddingLeft="24dp"
+    android:paddingRight="24dp"
     android:dividerHeight="8dp"
 />
diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml
new file mode 100644
index 000000000..aee19831e
--- /dev/null
+++ b/res/layout/drawer_list_item.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+      * Neither the name of The Linux Foundation nor the names of its
+        contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:paddingTop="10dp"
+    android:paddingBottom="10dp">
+
+    <ImageView
+        android:id="@+id/ivItem"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="16dp"
+        />
+
+    <TextView
+        android:id="@+id/itemTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="12sp"
+        android:layout_centerVertical="true"
+        android:fontFamily="sans-serif-medium"
+        android:textColor="#000000"
+        android:alpha="0.87"
+        android:layout_marginStart="64dp"
+       />
+</RelativeLayout>
diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml
index 2b77dfcd1..f31587c37 100644
--- a/res/layout/filtershow_actionbar.xml
+++ b/res/layout/filtershow_actionbar.xml
@@ -14,14 +14,20 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:background="@drawable/filtershow_button_background"
-    android:id="@+id/filtershow_done"
-    android:textAllCaps="true"
-    android:text="@string/save"
-    android:gravity="center_vertical"
-    android:textSize="14sp"
-    android:drawableStart="@drawable/menu_save_photo"
-    android:drawablePadding="8dip" />
\ No newline at end of file
+    android:layout_height="@dimen/toolbar_height" >
+
+    <TextView
+        android:id="@+id/filtershow_done"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:drawablePadding="24dp"
+        android:drawableStart="@drawable/done"
+        android:gravity="center_vertical"
+        android:paddingBottom="20dp"
+        android:text="@string/save"
+        android:textColor="#ffffff"
+        android:textSize="20sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/filtershow_actionbar_new.xml b/res/layout/filtershow_actionbar_new.xml
new file mode 100644
index 000000000..1e56b8d57
--- /dev/null
+++ b/res/layout/filtershow_actionbar_new.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+      * Neither the name of The Linux Foundation nor the names of its
+        contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="@dimen/toolbar_height"
+    android:paddingTop="15dp">
+
+    <ImageButton
+        android:id="@+id/imgCancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:background="@android:color/transparent"
+        android:src="@drawable/cancel"
+        android:paddingLeft="16dp"/>
+
+    <ImageButton
+        android:id="@+id/imgDone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:background="@android:color/transparent"
+        android:src="@drawable/done"
+        android:paddingRight="16dp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 79c315b7b..1340bc40d 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -16,85 +16,86 @@
 -->
 
 <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"
+    android:background="#212121" >
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
 
         <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            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:indeterminate="true"
-                    android:indeterminateOnly="true"
-                    android:background="@null"/>
-
-            <LinearLayout
-                    android:layout_weight="1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                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" />
 
-                <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"/>
+            <RelativeLayout
+                android:id="@+id/imageContainer"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:orientation="horizontal" >
 
                 <FrameLayout
-                        android:id="@+id/editorContainer"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"/>
+                    android:id="@+id/editorContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:visibility="gone" />
 
                 <com.android.gallery3d.filtershow.imageshow.ImageShow
-                        android:id="@+id/imageShow"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"/>
-
-
-            </LinearLayout>
-
-        </FrameLayout>
+                    android:id="@+id/imageShow"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1" />
 
-        <com.android.gallery3d.filtershow.CenteredLinearLayout
+                <ImageButton
+                    android:id="@+id/imgComparison"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginTop="104dp"
+                    android:background="@android:color/transparent"
+                    android:src="@drawable/comparison_before"
+                    android:visibility="visible" />
+            </RelativeLayout>
+
+            <com.android.gallery3d.filtershow.CenteredLinearLayout
                 xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
                 android:id="@+id/mainPanel"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="80dp"
                 android:layout_gravity="center|bottom"
-                custom:max_width="650dip"
-                android:orientation="vertical" >
-
-            <FrameLayout android:id="@+id/main_panel_container"
-                         android:layout_gravity="center"
-                         android:layout_width="match_parent"
-                         android:layout_height="0dip"
-                         android:layout_weight="1" />
-
-        </com.android.gallery3d.filtershow.CenteredLinearLayout>
+                android:orientation="vertical"
+                custom:max_width="650dip" >
 
+                <FrameLayout
+                    android:id="@+id/main_panel_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dip"
+                    android:layout_gravity="center"
+                    android:layout_weight="1" />
+            </com.android.gallery3d.filtershow.CenteredLinearLayout>
+        </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/filtershow_category_panel.xml b/res/layout/filtershow_category_panel.xml
index c1b8bbe35..74ead6376 100644
--- a/res/layout/filtershow_category_panel.xml
+++ b/res/layout/filtershow_category_panel.xml
@@ -17,8 +17,8 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="48dip"
-    android:background="@color/background_main_toolbar" >
+    android:layout_height="80dp"
+    android:background="@color/edit_actionbar_background" >
 
     <ImageButton
         android:id="@+id/fxButton"
diff --git a/res/layout/filtershow_category_panel_new.xml b/res/layout/filtershow_category_panel_new.xml
index 8073f68a4..51439f011 100644
--- a/res/layout/filtershow_category_panel_new.xml
+++ b/res/layout/filtershow_category_panel_new.xml
@@ -20,7 +20,7 @@
               android:orientation="horizontal"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:background="@color/filtershow_categoryview_background">
+              android:background="@color/edit_actionbar_background">
 
     <HorizontalScrollView
             android:layout_width="0dp"
diff --git a/res/layout/filtershow_color_picker.xml b/res/layout/filtershow_color_picker.xml
index 7b05765fc..482c4636f 100644
--- a/res/layout/filtershow_color_picker.xml
+++ b/res/layout/filtershow_color_picker.xml
@@ -17,14 +17,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:background="@color/background_main_toolbar">
+              android:background="@color/albumset_background">
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                   android:orientation="vertical"
                   android:id="@+id/RelativeLayout1"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
-                  android:background="@color/background_main_toolbar">
+                  android:background="@color/albumset_background">
 
         <com.android.gallery3d.filtershow.colorpicker.ColorCompareView
                 android:id="@+id/btnSelect"
@@ -66,7 +66,7 @@
                     android:background="@android:color/transparent"
                     android:layout_weight=".1"
                     android:gravity="center"
-                    android:src="@drawable/ic_menu_cancel_holo_light"
+                    android:src="@drawable/cancel2"
                     android:textSize="18dip"/>
 
             <ImageView
@@ -81,7 +81,7 @@
                     android:layout_weight=".1"
                     android:background="@android:color/transparent"
                     android:gravity="center"
-                    android:src="@drawable/ic_menu_done_holo_light"
+                    android:src="@drawable/done2"
                     android:textSize="18dip"/>
         </LinearLayout>
     </LinearLayout>
diff --git a/res/layout/filtershow_control_action_slider.xml b/res/layout/filtershow_control_action_slider.xml
index 34eac1e69..01d5e126e 100644
--- a/res/layout/filtershow_control_action_slider.xml
+++ b/res/layout/filtershow_control_action_slider.xml
@@ -19,7 +19,8 @@
     xmlns:app="http://schemas.android.com/apk/res/com.example.imagefilterharness"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal" >
+    android:orientation="horizontal"
+    android:gravity="center" >
 
     <ImageButton
         android:id="@+id/leftActionButton"
@@ -29,8 +30,9 @@
         android:scaleType="centerInside"
         android:layout_weight="0"
         android:background="@drawable/filtershow_button_background"
-        android:src="@drawable/filtershow_addpoint"
-        android:paddingBottom="8dp"  />
+        android:src="@drawable/addspot"
+        android:paddingBottom="8dp"
+        android:paddingStart="14dp"  />
 
     <SeekBar
         android:id="@+id/controlValueSeekBar"
@@ -48,8 +50,9 @@
         android:scaleType="centerInside"
         android:layout_weight="0"
         android:background="@drawable/filtershow_button_background"
-        android:src="@drawable/ic_menu_trash_holo_light"
-        android:paddingBottom="8dp"  />
+        android:src="@drawable/delete"
+        android:paddingBottom="8dp"
+        android:paddingEnd="14dp"  />
 
 </LinearLayout>
 
diff --git a/res/layout/filtershow_control_color_chooser.xml b/res/layout/filtershow_control_color_chooser.xml
index 145041cf0..18ac83d10 100644
--- a/res/layout/filtershow_control_color_chooser.xml
+++ b/res/layout/filtershow_control_color_chooser.xml
@@ -19,68 +19,64 @@
     xmlns:app="http://schemas.android.com/apk/res/com.example.imagefilterharness"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical|center_horizontal"
     android:orientation="horizontal" >
+
     <LinearLayout
-            android:id="@+id/listColors"
-            android:layout_weight="5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+        android:id="@+id/listColors"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:orientation="horizontal" >
 
         <Button
-                android:id="@+id/draw_color_button01"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:background="@drawable/filtershow_color_picker_circle"
-                android:layout_marginEnd="4dp"/>
+            android:id="@+id/draw_color_button01"
+            android:layout_width="@dimen/color_button_width"
+            android:layout_height="@dimen/color_button_height"
+            android:layout_marginEnd="22dp"
+            android:background="@drawable/filtershow_color_picker_circle" />
 
         <Button
-                android:id="@+id/draw_color_button02"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:background="@drawable/filtershow_color_picker_circle"
-                android:layout_marginEnd="4dp"/>
+            android:id="@+id/draw_color_button02"
+            android:layout_width="@dimen/color_button_width"
+            android:layout_height="@dimen/color_button_height"
+            android:layout_marginEnd="22dp"
+            android:background="@drawable/filtershow_color_picker_circle" />
 
         <Button
-                android:id="@+id/draw_color_button03"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:background="@drawable/filtershow_color_picker_circle"
-                android:layout_marginEnd="4dp"/>
+            android:id="@+id/draw_color_button03"
+            android:layout_width="@dimen/color_button_width"
+            android:layout_height="@dimen/color_button_height"
+            android:layout_marginEnd="22dp"
+            android:background="@drawable/filtershow_color_picker_circle" />
 
         <Button
-                android:id="@+id/draw_color_button04"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:background="@drawable/filtershow_color_picker_circle"
-                android:layout_marginEnd="4dp"/>
+            android:id="@+id/draw_color_button04"
+            android:layout_width="@dimen/color_button_width"
+            android:layout_height="@dimen/color_button_height"
+            android:layout_marginEnd="22dp"
+            android:background="@drawable/filtershow_color_picker_circle" />
 
         <Button
-                android:id="@+id/draw_color_button05"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:background="@drawable/filtershow_color_picker_circle"
-                android:layout_marginEnd="4dp"/>
-
+            android:id="@+id/draw_color_button05"
+            android:layout_width="@dimen/color_button_width"
+            android:layout_height="@dimen/color_button_height"
+            android:layout_marginEnd="22dp"
+            android:background="@drawable/filtershow_color_picker_circle" />
     </LinearLayout>
 
     <FrameLayout
-            android:background="@color/background_main_toolbar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center">
-    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginRight="16dp" >
+
+        <Button
             android:id="@+id/draw_color_popupbutton"
             android:layout_width="wrap_content"
-            android:layout_gravity="center"
             android:layout_height="wrap_content"
-            android:background="@drawable/ic_action_overflow"
-            />
+            android:layout_gravity="center"
+            android:background="@drawable/more2" />
     </FrameLayout>
-</LinearLayout>
 
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml
index 995399618..8fc01ecae 100644
--- a/res/layout/filtershow_editor_panel.xml
+++ b/res/layout/filtershow_editor_panel.xml
@@ -18,105 +18,56 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/top"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:visibility="visible" >
 
-    <View
-            android:background="@color/toolbar_separation_line"
-            android:layout_height="1dip"
-            android:layout_width="match_parent"/>
+    <!-- <View -->
+    <!-- android:layout_width="match_parent" -->
+    <!-- android:layout_height="1dip" -->
+    <!-- android:background="@color/toolbar_separation_line" /> -->
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
 
         <LinearLayout
-                android:id="@+id/controlArea"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_alignParentBottom="true"
-                android:visibility="visible">
+            android:id="@+id/controlArea"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentBottom="true"
+            android:background="#000000"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:visibility="visible" >
+
+<!--             <TextView -->
+<!--                 android:id="@+id/tvFilterName" -->
+<!--                 android:layout_width="@dimen/swap_button_width" -->
+<!--                 android:layout_height="@dimen/swap_button_height" -->
+<!--                 android:text="@string/apply_effect" -->
+<!--                 android:layout_gravity="left" -->
+<!--                 android:textColor="#ffffff" -->
+<!--                 android:textSize="20sp"  -->
+<!--                 android:layout_weight="1"/> -->
 
             <SeekBar
-                    android:id="@+id/primarySeekBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    style="@style/FilterShowSlider"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="48dip"
-                android:background="@color/background_main_toolbar"
-                android:orientation="horizontal"
-                android:baselineAligned="false"
-                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: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"/>
+                android:id="@+id/primarySeekBar"
+                style="@style/FilterShowSlider"
+                android:layout_width="@dimen/seekbar_width_filter"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|center_horizontal"
+                android:layout_weight="1"
+                android:layout_marginLeft="54dp"
+                android:layout_marginRight="54dp" />
         </LinearLayout>
 
-        <FrameLayout android:id="@+id/state_panel_container"
-                     android:layout_width="match_parent"
-                     android:layout_height="wrap_content"
-                     android:visibility="visible" />
-
+        <FrameLayout
+            android:id="@+id/state_panel_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/filtershow_export_dialog.xml b/res/layout/filtershow_export_dialog.xml
index 00add15a5..3b41ddaa4 100644
--- a/res/layout/filtershow_export_dialog.xml
+++ b/res/layout/filtershow_export_dialog.xml
@@ -27,6 +27,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|center_vertical"
         android:layout_margin="7dp"
+        android:paddingStart="8dp"
+        android:textSize="16sp"
+        android:textColor="@color/albumset_label_background"
         android:text="@string/select_output_settings"/>
 
     <GridLayout
@@ -35,34 +38,43 @@
         android:layout_height="wrap_content"
         android:alignmentMode="alignBounds"
         android:useDefaultMargins="true"
+        android:layout_marginTop="24dp"
         android:columnOrderPreserved="false"
         android:columnCount="5">
 
         <TextView
                 android:text="@string/size"
                 android:layout_marginStart="8dp"
-                android:layout_gravity="start|center_vertical"/>
+                android:layout_gravity="start|center_vertical"
+                android:paddingStart="8dp"
+                android:textSize="16sp"
+                android:textColor="@color/albumlist_label_title"/>
 
         <EditText
                 android:id="@+id/editableWidth"
                 android:layout_gravity="right|center_vertical"
+                android:gravity="center"
                 android:layout_width="70dp"
                 android:inputType="number"/>
 
         <TextView
                 android:text="@string/x"
-                android:layout_gravity="center"/>
+                android:layout_gravity="center"
+                android:textColor="@color/albumlist_label_title"/>
 
         <EditText
                 android:id="@+id/editableHeight"
                 android:layout_gravity="left|center_vertical"
                 android:layout_width="70dp"
+                android:gravity="center"
                 android:inputType="number"/>
 
         <TextView
                 android:id="@+id/estimadedSize"
                 android:layout_marginEnd="8dp"
-                android:layout_gravity="end|center_vertical"/>
+                android:layout_gravity="end|center_vertical"
+                android:textSize="16sp"
+                android:textColor="@color/albumlist_label_title"/>
 
         <LinearLayout
                 android:layout_columnSpan="5"
@@ -73,7 +85,9 @@
                 android:text="@string/quality"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
-                android:layout_margin="8dp" />
+                android:layout_margin="8dp"
+                android:textSize="16sp"
+                android:textColor="@color/albumlist_label_title" />
 
             <SeekBar
                 android:id="@+id/qualitySeekBar"
@@ -92,7 +106,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
-                android:layout_gravity="end|center_vertical" />
+                android:textSize="16sp"
+                android:textColor="@color/albumlist_label_title"
+                android:layout_gravity="end|center_vertical"
+                />
 
         </LinearLayout>
 
@@ -103,23 +120,27 @@
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="48dp"
-            style="?android:attr/buttonBarStyle">
+            style="?android:attr/buttonBarStyle"
+            android:gravity="right">
 
         <Button
                 android:id="@+id/cancel"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
                 android:text="@string/cancel"
-                style="?android:attr/buttonBarButtonStyle" />
+                android:textSize="14sp"
+                android:layout_marginRight="8dp"
+                style="?android:attr/buttonBarButtonStyle"
+                android:textColor="#009688"/>
 
         <Button
                 android:id="@+id/done"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
+                android:textSize="14sp"
                 android:text="@string/done"
-                style="?android:attr/buttonBarButtonStyle"/>
+                style="?android:attr/buttonBarButtonStyle"
+                android:textColor="#009688"/>
 
     </LinearLayout>
 
diff --git a/res/layout/filtershow_info_panel.xml b/res/layout/filtershow_info_panel.xml
index 1ca64bd6d..552fef2e9 100644
--- a/res/layout/filtershow_info_panel.xml
+++ b/res/layout/filtershow_info_panel.xml
@@ -19,8 +19,8 @@
               android:minWidth="340dp"
               android:layout_height="match_parent"
               android:orientation="vertical"
-              android:background="@color/background_main_toolbar"
-              android:padding="16dp">
+              android:background="@color/albumset_background"
+              android:padding="24dp">
 
     <ScrollView
             android:layout_width="match_parent"
@@ -35,29 +35,34 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
+                    android:weightSum="1"
                     >
 
                 <TextView
                         android:id="@+id/imageName"
                         style="?android:textAppearanceSmall"
                         android:textStyle="bold"
-                        android:textColor="#80ffffff"
+                        android:textSize="16sp"
+                        android:textColor="@color/albumlist_label_title"
                         android:layout_gravity="start"
-                        android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:gravity="start"/>
+                        android:gravity="start"
+                        android:ellipsize="end"
+                        android:layout_weight="0.65"
+                        android:maxLines="1"/>
 
                 <TextView
                         android:id="@+id/imageSize"
                         style="?android:textAppearanceSmall"
                         android:textAllCaps="true"
-                        android:textColor="#80ffffff"
+                        android:textSize="16sp"
+                        android:textColor="@color/albumlist_label_title"
                         android:textStyle="bold"
                         android:layout_gravity="end"
+                        android:layout_weight="0.35"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         android:gravity="end"/>
 
             </LinearLayout>
@@ -91,8 +96,9 @@
                     style="?android:textAppearanceLarge"
                     android:id="@+id/exifLabel"
                     android:textStyle="bold"
-                    android:textColor="#fff"
-                    android:layout_marginTop="16dp"
+                    android:textSize="20sp"
+                    android:textColor="@color/filtershow_info_text"
+                    android:layout_marginTop="24dp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
@@ -102,8 +108,11 @@
                     android:id="@+id/exifData"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
+                    android:layout_marginTop="20dp"
+                    android:textSize="16sp"
+                    android:textColor="@color/albumlist_label_title"
                     android:layout_gravity="start"
+                    android:layout_marginBottom="32dp"
                     />
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/filtershow_main_panel.xml b/res/layout/filtershow_main_panel.xml
index 1dc4e9f3f..7a0ead87c 100644
--- a/res/layout/filtershow_main_panel.xml
+++ b/res/layout/filtershow_main_panel.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+     Copyright (c) 2015, The Linux Foundation. All rights reserved.
+     Not a Contribution
+
      Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,107 +19,165 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:baselineAligned="false"
-              android:orientation="vertical"
-              android:animateLayoutChanges="false"
-              android:visibility="visible"
-              android:background="@color/background_main_toolbar" >
-
-    <FrameLayout android:id="@+id/state_panel_container"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:visibility="visible"
-                 android:layout_gravity="top"
-                 android:layout_weight="1" />
-
-    <FrameLayout android:id="@+id/category_panel_container"
-                 android:layout_width="match_parent"
-                 android:visibility="visible"
-                 android:layout_height="0dip"
-                 android:layout_gravity="center"
-                 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="false"
+    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"
-            android:id="@+id/bottom_panel"
+        xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
+        android:id="@+id/bottom_panel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center|bottom"
+        android:background="@color/edit_actionbar_background"
+        android:orientation="vertical"
+        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">
-
-        <LinearLayout android:layout_width="wrap_content"
-                      android:layout_height="match_parent"
-                      android:background="@color/background_main_toolbar">
+            android:layout_height="0dip"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:visibility="gone" />
 
-            <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"/>
+        <LinearLayout
+            android:id="@+id/effectsContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="10dp" >
 
             <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/fxButton"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:scaleType="centerInside"
+                android:src="@drawable/color" />
 
             <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/borderButton"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:padding="2dip"
+                android:scaleType="centerInside"
+                android:src="@drawable/frames" />
 
             <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/geometryButton"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:padding="2dip"
+                android:scaleType="centerInside"
+                android:src="@drawable/crop" />
 
             <ImageButton
-                    android:id="@+id/makeupButton"
-                    android:layout_width="@dimen/thumbnail_size"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:padding="2dip"
-                    android:background="@drawable/filtershow_button_background"
-                    android:scaleType="centerInside"
-                    android:visibility="gone"
-                    android:src="@drawable/ic_photoeditor_makeup"/>
+                android:id="@+id/colorsButton"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="wrap_content"
+                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="wrap_content"
+                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_height="wrap_content"
                     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="wrap_content"
+                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="wrap_content"
+                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="wrap_content"
+                android:layout_weight="1"
+                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="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/exposure"
+                android:gravity="center"
+                android:textColor="#ffffff"
+                android:textSize="@dimen/edit_main_font" />
+
+            <TextView
+                android:id="@+id/tvBeautify"
+                android:layout_width="@dimen/thumbnail_size"
+                android:layout_height="wrap_content"
+                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>
-
 </LinearLayout>
diff --git a/res/layout/filtershow_seekbar.xml b/res/layout/filtershow_seekbar.xml
index 54a874d07..f4d5577d2 100644
--- a/res/layout/filtershow_seekbar.xml
+++ b/res/layout/filtershow_seekbar.xml
@@ -19,14 +19,52 @@
     android:id="@+id/top"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     android:visibility="visible" >
 
+    <LinearLayout
+        android:id="@+id/basicFilterContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/tvFilterValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_gravity="left|center_vertical"
+            android:paddingLeft="23dp"
+            android:paddingTop="20dp"
+            android:textColor="#ffffff"
+            android:textSize="20sp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/tvFilterName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/tvFilterValue"
+            android:layout_gravity="center_vertical"
+            android:paddingLeft="12dp"
+            android:paddingTop="14dp"
+            android:text="@string/apply_effect"
+            android:textColor="#ffffff"
+            android:textSize="14sp"
+            android:visibility="gone" />
+    </LinearLayout>
+
     <SeekBar
         android:id="@+id/primarySeekBar"
+        style="@style/FilterShowSlider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/FilterShowSlider"
+        android:layout_gravity="center_vertical|center_horizontal"
+        android:layout_marginRight="34dp"
+        android:layout_toRightOf="@+id/tvFilterName"
+        android:layout_weight="1"
+        android:paddingTop="20dp"
         android:visibility="gone" />
 
 </LinearLayout>
diff --git a/res/layout/filtershow_state_panel_new.xml b/res/layout/filtershow_state_panel_new.xml
index b19969567..4ea7c8ae7 100644
--- a/res/layout/filtershow_state_panel_new.xml
+++ b/res/layout/filtershow_state_panel_new.xml
@@ -5,7 +5,7 @@
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:background="@color/background_main_toolbar">
+              android:background="@color/edit_actionbar_background">
 
     <View
             android:background="@color/toolbar_separation_line"
diff --git a/res/layout/gallery_main.xml b/res/layout/gallery_main.xml
new file mode 100644
index 000000000..8aa2c07eb
--- /dev/null
+++ b/res/layout/gallery_main.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+      * Neither the name of The Linux Foundation nor the names of its
+        contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/drawerLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <!-- MAIN CONTENT -->
+
+    <RelativeLayout
+        android:id="@+id/gallery_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <include layout="@layout/gl_root_group" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <include
+            android:id="@+id/toolbar"
+            layout="@layout/toolbar" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/drawerPane"
+        android:layout_width="270dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:background="#fafafa"
+        android:clickable="true" >
+
+        <!-- Header -->
+
+        <RelativeLayout
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:background="@drawable/drawer_bg" >
+
+            <TextView
+                android:id="@+id/appName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="16dp"
+                android:layout_marginStart="16dp"
+                android:fontFamily="sans-serif"
+                android:text="@string/navigation_drawer_title"
+                android:textColor="#ffffff"
+                android:textSize="24sp" />
+        </RelativeLayout>
+
+        <ListView
+            android:id="@+id/navList"
+            android:layout_width="270dp"
+            android:layout_height="match_parent"
+            android:layout_below="@id/header"
+            android:layout_marginTop="4dp"
+            android:divider="@android:color/transparent" />
+    </RelativeLayout>
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/res/layout/gl_root_group.xml b/res/layout/gl_root_group.xml
index 76ff33b73..de0f66afe 100644
--- a/res/layout/gl_root_group.xml
+++ b/res/layout/gl_root_group.xml
@@ -22,5 +22,6 @@
     <View android:id="@+id/gl_root_cover"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@android:color/black"/>
+            android:background="#fafafa"
+           />
 </merge>
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml
index 20b3c11cd..fc9882280 100644
--- a/res/layout/photopage_bottom_controls.xml
+++ b/res/layout/photopage_bottom_controls.xml
@@ -1,50 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/photopage_bottom_controls"
-        android:padding="10dp"
-        android:layout_width="match_parent"
+    android:id="@+id/photopage_bottom_controls"
+    android:layout_width="match_parent"
+    android:layout_height="56dp"
+    android:layout_alignParentBottom="true"
+    android:background="#42000000"
+    android:orientation="horizontal"
+    android:visibility="gone" >
+
+    <ImageButton
+        android:id="@+id/photopage_bottom_control_edit"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
-        android:orientation="horizontal"
-        android:visibility="gone">
-        <ImageButton
-                android:id="@+id/photopage_bottom_control_edit"
-                android:src="@drawable/ic_menu_edit_holo_dark"
-                android:background="@drawable/photopage_bottom_button_background"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentBottom="true"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:paddingStart="15dp"
-                android:paddingEnd="15dp"
-                android:visibility="gone"/>
-        <ImageButton
-                android:id="@+id/photopage_bottom_control_panorama"
-                android:src="@drawable/ic_view_photosphere"
-                android:background="@drawable/transparent_button_background"
-                android:layout_width="70dp"
-                android:layout_height="70dp"
-                android:layout_centerHorizontal="true"
-                android:layout_alignParentBottom="true"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:visibility="gone"/>
-        <ImageButton
-                android:id="@+id/photopage_bottom_control_tiny_planet"
-                android:src="@drawable/ic_menu_tiny_planet"
-                android:background="@drawable/photopage_bottom_button_background"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:paddingTop="5dp"
-                android:paddingBottom="5dp"
-                android:paddingStart="15dp"
-                android:paddingEnd="15dp"
-                android:visibility="gone"/>
+        android:layout_centerVertical="true"
+        android:background="@null"
+        android:paddingStart="20dp"
+        android:layout_marginBottom="20dp"
+        android:src="@drawable/edit"
+        android:visibility="gone" />
+
+    <ImageButton
+        android:id="@+id/photopage_bottom_control_share"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="20dp"
+        android:layout_centerInParent="true"
+        android:layout_centerVertical="true"
+        android:background="@null"
+        android:src="@drawable/share"
+        android:visibility="gone" />
+
+    <ImageButton
+        android:id="@+id/photopage_bottom_control_delete"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginBottom="20dp"
+        android:background="@null"
+        android:paddingEnd="20dp"
+        android:src="@drawable/delete"
+        android:visibility="gone" />
+
 </RelativeLayout>
diff --git a/res/layout/popup_list_item.xml b/res/layout/popup_list_item.xml
index 837da0a5d..f0bafc1e8 100644
--- a/res/layout/popup_list_item.xml
+++ b/res/layout/popup_list_item.xml
@@ -19,6 +19,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
+    android:textSize="20sp"
+    android:textColor="#8A000000"
     android:singleLine="true"
     android:gravity="center_vertical"
     android:paddingStart="16dp"
diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml
new file mode 100644
index 000000000..0d1cea067
--- /dev/null
+++ b/res/layout/toolbar.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials provided
+        with the distribution.
+      * Neither the name of The Linux Foundation nor the names of its
+        contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+  ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/toolbar_height"
+    android:paddingTop="30dp"
+    android:background="#e53935"
+    android:elevation="4dp"
+    android:theme="@style/ToolbarTheme"
+    android:popupTheme="@style/ToolbarPopUpTheme"
+    android:navigationIcon="@drawable/drawer" >
+
+</Toolbar>
\ No newline at end of file