Gallery2: Materialization

- Material theme
- FAB
- New Icon
- Add missing resources for movie settings
- Fix action mode
- Vector drawables

Change-Id: I9c8cc81759502a417a5585fd1d3fd9b61e0bd68b

5 files changed, 96 insertions, 79 deletions

diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml
index f107c26ee..096187b95 100644
--- a/res/layout/action_mode.xml
+++ b/res/layout/action_mode.xml
@@ -14,35 +14,22 @@
      limitations under the License.
 -->
 
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/navigation_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="wrap_content"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
             android:layout_height="match_parent">
-        <ImageView android:layout_gravity="end"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:src="@drawable/dropdown_ic_arrow_normal_holo_dark" />
-        <Button android:id="@+id/selection_menu"
-                style="?android:attr/actionButtonStyle"
-                android:divider="?android:attr/listDividerAlertDialog"
-                android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
-                android:textColor="?android:attr/actionMenuTextColor"
-                android:singleLine="true"
-                android:gravity="left|center_vertical"
-                android:paddingEnd="25dip"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent" />
-    </FrameLayout>
-    <ImageView android:layout_marginStart="16dip"
-            android:layout_marginEnd="8dip"
+    <Button android:id="@+id/selection_menu"
+            style="?android:attr/actionButtonStyle"
+            android:divider="?android:attr/listDividerAlertDialog"
+            android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
+            android:textColor="?android:attr/actionMenuTextColor"
+            android:singleLine="true"
+            android:gravity="left|center_vertical"
+            android:paddingRight="25dip"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="bottom"
-            android:src="@drawable/cab_divider_vertical_dark" />
-</LinearLayout>
+            android:layout_height="match_parent" />
+    <ImageView android:layout_width="wrap_content"
+               android:layout_height="match_parent"
+               android:src="@drawable/dropdown_ic_arrow"
+               android:layout_toRightOf="@id/selection_menu"/>
+
+</RelativeLayout>
diff --git a/res/layout/filtershow_control_action_slider.xml b/res/layout/filtershow_control_action_slider.xml
index 34eac1e69..ebaf7be18 100644
--- a/res/layout/filtershow_control_action_slider.xml
+++ b/res/layout/filtershow_control_action_slider.xml
@@ -48,7 +48,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/ic_menu_trash"
         android:paddingBottom="8dp"  />
 
 </LinearLayout>
diff --git a/res/layout/filtershow_presets_management_row.xml b/res/layout/filtershow_presets_management_row.xml
index bd3e47928..d4e05bafe 100644
--- a/res/layout/filtershow_presets_management_row.xml
+++ b/res/layout/filtershow_presets_management_row.xml
@@ -47,6 +47,6 @@
             android:background="@android:color/transparent"
             android:layout_weight=".1"
             android:gravity="center"
-            android:src="@drawable/ic_menu_trash_holo_light"
+            android:src="@drawable/ic_menu_trash"
             android:visibility="gone"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/multigrid_content.xml b/res/layout/multigrid_content.xml
index b1cb145a2..618af4898 100644
--- a/res/layout/multigrid_content.xml
+++ b/res/layout/multigrid_content.xml
@@ -36,7 +36,7 @@
 
     </LinearLayout>
 
-    <FrameLayout android:id="@+id/gridContainer"
+    <HorizontalScrollView android:id="@+id/gridContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -52,6 +52,6 @@
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
-    </FrameLayout>
+    </HorizontalScrollView>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml
index 20b3c11cd..51f714ede 100644
--- a/res/layout/photopage_bottom_controls.xml
+++ b/res/layout/photopage_bottom_controls.xml
@@ -1,50 +1,80 @@
 <?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:padding="10dp"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:layout_alignParentBottom="true"
+  android:layout_alignParentRight="true"
+  android:orientation="horizontal"
+  android:visibility="gone">
+
+  <FrameLayout
+    android:id="@+id/photopage_bottom_control_tiny_planet"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/floating_action_button_margin_left"
+    android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentBottom="true"
+    android:background="@drawable/floating_action_button"
+    android:elevation="@dimen/floating_action_button_translation_z"
+    android:clickable="true"
+    android:visibility="gone">
+    <ImageButton
+      android:layout_width="@dimen/floating_action_button_width"
+      android:layout_height="@dimen/floating_action_button_height"
+      android:id="@+id/floating_action_button_tiny_planet"
+      android:background="@drawable/floating_action_button"
+      android:tint="@color/floating_action_button_icon_color"
+      android:src="@drawable/ic_menu_tiny_planet"
+      android:clickable="false"
+      android:duplicateParentState="true"/>
+    </FrameLayout>
+
+    <FrameLayout
+      android:id="@+id/photopage_bottom_control_panorama"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="@dimen/floating_action_button_margin_left"
+      android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
+      android:layout_centerHorizontal="true"
+      android:layout_alignParentBottom="true"
+      android:background="@drawable/floating_action_button"
+      android:elevation="@dimen/floating_action_button_translation_z"
+      android:clickable="true"
+      android:visibility="gone">
+      <ImageButton
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:id="@+id/floating_action_button_panorama"
+        android:background="@drawable/floating_action_button"
+        android:tint="@color/floating_action_button_icon_color"
+        android:src="@drawable/ic_view_photosphere"
+        android:clickable="false"
+        android:duplicateParentState="true"/>
+      </FrameLayout>
+
+      <FrameLayout
+        android:id="@+id/photopage_bottom_control_edit"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/floating_action_button_margin_right"
+        android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"
+        android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentStart="true"
-        android:orientation="horizontal"
+        android:background="@drawable/fab_accent"
+        android:elevation="@dimen/floating_action_button_translation_z"
+        android:clickable="true"
         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"/>
-</RelativeLayout>
+          android:layout_width="@dimen/floating_action_button_width"
+          android:layout_height="@dimen/floating_action_button_height"
+          android:id="@+id/floating_action_button_edit"
+          android:background="@drawable/floating_action_button"
+          android:tint="@color/floating_action_button_icon_color"
+          android:src="@drawable/ic_edit"
+          android:clickable="false"
+          android:duplicateParentState="true"/>
+        </FrameLayout>
+      </RelativeLayout>