Merge branch 'lineage-18.1' of https://github.com/LineageOS/android_packages_apps_Snap into HEADHEADs12.1

Change-Id: Ia09760085480a6a028c8969f16f503070ab816e5

10 files changed, 46 insertions, 46 deletions

diff --git a/res/layout/bestpicture_page.xml b/res/layout/bestpicture_page.xml
index 5a1b604f0..5a1b604f0 100755..100644
--- a/res/layout/bestpicture_page.xml
+++ b/res/layout/bestpicture_page.xml
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 1ebb564ae..1ebb564ae 100755..100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
diff --git a/res/layout/camera2_mode_item.xml b/res/layout/camera2_mode_item.xml
index 9bb8bccc6..4345af3cc 100755..100644
--- a/res/layout/camera2_mode_item.xml
+++ b/res/layout/camera2_mode_item.xml
@@ -29,15 +29,18 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/camera2_mode_item_root"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="@color/black">
 
-    <TextView
-        android:id="@+id/mode_text"
-        android:layout_width="80dp"
-        android:layout_height="32dp"
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/mode_icon"
+        android:padding="24dp"
         android:gravity="center"
         android:layout_gravity="center"
-        android:textSize="16sp"
-        android:textColor="@color/mode_text_selector"/>
+        android:scaleType="center"
+        android:selectable="true"
+        android:background="@drawable/bg_pressed"
+        android:layout_width="@dimen/camera_icon_width"
+        android:layout_height="@dimen/camera_icon_height" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/multi_camera_module.xml b/res/layout/multi_camera_module.xml
index 6b46dce74..6b46dce74 100755..100644
--- a/res/layout/multi_camera_module.xml
+++ b/res/layout/multi_camera_module.xml
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml
index ac7fd9ba2..d778d9935 100755..100644
--- a/res/layout/one_ui_layout.xml
+++ b/res/layout/one_ui_layout.xml
@@ -31,7 +31,7 @@
     <com.android.camera.ui.FlashToggleButton
         android:id="@+id/flash_button"
         style="@style/OneUIMenuButton"
-        android:src="@drawable/flash" />
+        android:src="@drawable/ic_flash_on" />
 
     <com.android.camera.ui.RotateImageView
         android:id="@+id/mute_button"
@@ -92,13 +92,8 @@
 
     <com.android.camera.ui.RotateImageView
         android:id="@+id/front_back_switcher"
-        android:layout_width="@dimen/one_ui_bottom_small"
-        android:layout_height="@dimen/one_ui_bottom_small"
-        android:focusable="true"
-        android:clickable="true"
-        android:scaleType="fitCenter"
-        android:visibility="gone"
-        android:src="@drawable/front_back_camera" />
+        style="@style/OneUIMenuButton"
+        android:src="@drawable/ic_switch_back" />
 
     <com.android.camera.ui.RotateImageView
         android:id="@+id/preview_thumb"
@@ -128,12 +123,12 @@
     <com.android.camera.ui.RotateImageView
         android:id="@+id/scene_mode_switcher"
         style="@style/OneUIMenuButton"
-        android:src="@drawable/more_options" />
+        android:src="@drawable/ic_settings_scenemode" />
 
     <com.android.camera.ui.RotateImageView
         android:id="@+id/filter_mode_switcher"
         style="@style/OneUIMenuButton"
-        android:src="@drawable/filters" />
+        android:src="@drawable/ic_settings_filter" />
 
     <com.android.camera.ui.RotateImageView
         android:id="@+id/ts_makeup_switcher"
@@ -141,7 +136,16 @@
 
     <com.android.camera.ui.RotateImageView
         android:id="@+id/settings"
-        style="@style/OneUIMenuButton" />
+        style="@style/OneUIMenuButton"
+        android:src="@drawable/ic_settings_advanced" />
+
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/mode_switcher"
+        style="@style/OneUIMenuButton"
+        android:src="@drawable/ic_switch_camera"
+        android:width="@dimen/camera_icon_width"
+        android:height="@dimen/camera_icon_height"
+        android:scaleType="center" />
 
     <LinearLayout
         android:id="@+id/remaining_photos"
@@ -207,8 +211,6 @@
             android:minHeight="1dip"
             android:visibility="gone"
             android:layout_gravity="center_horizontal"
-            android:progressDrawable="@drawable/beautify_progressbar_style"
-            android:thumb="@drawable/ic_beautify_oval"
             android:id="@id/zoom_seekbar"/>
     </LinearLayout>
 
@@ -271,21 +273,11 @@
         </RelativeLayout>
     </LinearLayout>
 
-    <FrameLayout
-        android:layout_width="match_parent"
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/mode_select_layout"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_marginBottom="100dp"
-        android:background="@color/camera_control_bg_transparent">
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/mode_select_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|bottom"
-            android:layout_centerHorizontal="true"
-            android:scrollbars="none" />
-
-    </FrameLayout>
+        android:scrollbars="none"
+        android:visibility="invisible" />
 
 </com.android.camera.ui.OneUICameraControls>
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index ba5758747..ba5758747 100755..100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
diff --git a/res/layout/preference.xml b/res/layout/preference.xml
index d2f3f05d3..c77de40dd 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference.xml
@@ -25,7 +25,7 @@
     android:paddingEnd="?android:attr/scrollbarSize">
 
     <ImageView
-        android:id="@+android:id/icon"
+        android:id="@android:id/icon"
         android:layout_width="25dp"
         android:layout_height="25dp"
         android:layout_gravity="center"
@@ -43,7 +43,7 @@
         android:layout_weight="1">
 
         <TextView
-            android:id="@+android:id/title"
+            android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="marquee"
@@ -53,7 +53,7 @@
             android:textSize="14sp" />
 
         <TextView
-            android:id="@+android:id/summary"
+            android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignStart="@android:id/title"
@@ -67,7 +67,7 @@
 
     <!-- Preference should place its actual preference widget here. -->
     <LinearLayout
-        android:id="@+android:id/widget_frame"
+        android:id="@android:id/widget_frame"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
diff --git a/res/layout/pro_mode_layout.xml b/res/layout/pro_mode_layout.xml
index 7dd12aa01..5f123eaa4 100755..100644
--- a/res/layout/pro_mode_layout.xml
+++ b/res/layout/pro_mode_layout.xml
@@ -44,7 +44,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:focusable="true"
-            android:drawableTop="@drawable/promode_exposure"
+            android:drawableTop="@drawable/ic_settings_exposure"
+            android:drawableTint="@color/promode_selection_tint"
             android:gravity="center"
             android:layout_gravity="center"
             android:layout_weight="1"/>
@@ -62,7 +63,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:focusable="true"
-            android:drawableTop="@drawable/promode_manual"
+            android:drawableTop="@drawable/ic_settings_focus"
+            android:drawableTint="@color/promode_selection_tint"
             android:gravity="center"
             android:layout_gravity="center"
             android:layout_weight="1" />
@@ -80,7 +82,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:focusable="true"
-            android:drawableTop="@drawable/promode_white_balance"
+            android:drawableTop="@drawable/ic_settings_wb_api2"
+            android:drawableTint="@color/promode_selection_tint"
             android:gravity="center"
             android:layout_gravity="center"
             android:layout_weight="1"/>
@@ -97,7 +100,8 @@
             android:id="@+id/iso_value"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:drawableTop="@drawable/promode_iso"
+            android:drawableTop="@drawable/ic_settings_iso"
+            android:drawableTint="@color/promode_selection_tint"
             android:focusable="true"
             android:gravity="center"
             android:layout_gravity="center"
@@ -115,7 +119,8 @@
             android:id="@+id/zoom_seekbar_value"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:drawableTop="@drawable/promode_manual"
+            android:drawableTop="@drawable/ic_settings_zoom"
+            android:drawableTint="@color/promode_selection_tint"
             android:focusable="true"
             android:gravity="center"
             android:layout_gravity="center"
diff --git a/res/layout/scene_mode_menu_layout.xml b/res/layout/scene_mode_menu_layout.xml
index 9c10bd73e..4c5712557 100644
--- a/res/layout/scene_mode_menu_layout.xml
+++ b/res/layout/scene_mode_menu_layout.xml
@@ -65,5 +65,5 @@
         android:layout_centerHorizontal="true"
         android:layout_margin="10dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/settings" />
+        android:src="@drawable/ic_settings_advanced" />
 </RelativeLayout>
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 0d8c4cb30..0d8c4cb30 100755..100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml