Change video effect setting to a grid view.

bug:5226051

Change-Id: If3c6aece533a263411f55d21a9cc76282b021554

7 files changed, 104 insertions, 4 deletions

diff --git a/res/layout/effect_setting_item.xml b/res/layout/effect_setting_item.xml
new file mode 100644
index 0000000..0b212c3
--- /dev/null
+++ b/res/layout/effect_setting_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        style="@style/EffectSettingItem">
+
+        <ImageView android:id="@+id/image"
+                android:layout_width="@dimen/effect_setting_item_icon_width"
+                android:layout_height="@dimen/effect_setting_item_icon_width"
+                android:layout_gravity="center_horizontal"
+                android:scaleType="fitCenter"
+                android:adjustViewBounds="true" />
+        <TextView android:id="@+id/text"
+                style="@style/EffectSettingItemTitle"/>
+</LinearLayout>
diff --git a/res/layout/effect_setting_popup.xml b/res/layout/effect_setting_popup.xml
new file mode 100644
index 0000000..590c3e3
--- /dev/null
+++ b/res/layout/effect_setting_popup.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.camera.ui.BasicSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
+        style="@style/SettingPopupWindow">
+
+    <LinearLayout android:orientation="vertical"
+        android:layout_height="wrap_content"
+        android:layout_width="@dimen/big_setting_popup_window_width">
+
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/dialog_top_holo_dark"
+                android:minHeight="@dimen/popup_title_frame_min_height">
+            <TextView android:id="@+id/title"
+                    style="@style/PopupTitleText" />
+        </FrameLayout>
+
+        <FrameLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/dialog_bottom_holo_dark">
+            <GridView android:id="@+id/settingList"
+                    style="@style/EffectSettingGrid"
+                    android:choiceMode="singleChoice" />
+        </FrameLayout>
+    </LinearLayout>
+</com.android.camera.ui.BasicSettingPopup>
diff --git a/res/layout/other_setting_popup.xml b/res/layout/other_setting_popup.xml
index 730e00a..b207e2f 100644
--- a/res/layout/other_setting_popup.xml
+++ b/res/layout/other_setting_popup.xml
@@ -22,7 +22,7 @@
         style="@style/SettingPopupWindow">
 
     <LinearLayout android:orientation="vertical"
-        android:layout_width="@dimen/other_setting_popup_window_width"
+        android:layout_width="@dimen/big_setting_popup_window_width"
         android:layout_height="wrap_content">
 
         <FrameLayout
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
index b5a5e95..a3c909d 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -43,6 +43,8 @@
     <dimen name="setting_item_list_margin">16dp</dimen>
     <dimen name="popup_title_text_size">22dp</dimen>
     <dimen name="popup_title_frame_min_height">48dp</dimen>
-    <dimen name="other_setting_popup_window_width">590dp</dimen>
+    <dimen name="big_setting_popup_window_width">590dp</dimen>
     <dimen name="setting_item_icon_width">35dp</dimen>
+    <dimen name="effect_setting_item_icon_width">54dp</dimen>
+    <dimen name="effect_setting_item_text_size">21dp</dimen>
 </resources>
diff --git a/res/values-w1280dp/dimens.xml b/res/values-w1280dp/dimens.xml
index a707720..6bde0a5 100644
--- a/res/values-w1280dp/dimens.xml
+++ b/res/values-w1280dp/dimens.xml
@@ -33,6 +33,6 @@
     <dimen name="setting_item_list_margin">16dp</dimen>
     <dimen name="popup_title_text_size">22dp</dimen>
     <dimen name="popup_title_frame_min_height">48dp</dimen>
-    <dimen name="other_setting_popup_window_width">590dp</dimen>
+    <dimen name="big_setting_popup_window_width">590dp</dimen>
     <dimen name="setting_item_icon_width">35dp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1e14663..fe1f2d7 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -40,6 +40,8 @@
     <dimen name="setting_item_list_margin">6dp</dimen>
     <dimen name="popup_title_text_size">18dp</dimen>
     <dimen name="popup_title_frame_min_height">32dp</dimen>
-    <dimen name="other_setting_popup_window_width">320dp</dimen>
+    <dimen name="big_setting_popup_window_width">320dp</dimen>
     <dimen name="setting_item_icon_width">28dp</dimen>
+    <dimen name="effect_setting_item_icon_width">40dp</dimen>
+    <dimen name="effect_setting_item_text_size">12dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ddd6371..91426c8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -170,4 +170,33 @@
         <item name="android:windowEnterAnimation">@anim/share_popup_enter</item>
         <item name="android:windowExitAnimation">@anim/share_popup_exit</item>
     </style>
+    <style name="EffectSettingGrid">
+        <item name="android:layout_marginLeft">@dimen/setting_item_list_margin</item>
+        <item name="android:layout_marginRight">@dimen/setting_item_list_margin</item>
+        <item name="android:paddingBottom">3dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:numColumns">3</item>
+        <item name="android:verticalSpacing">3dp</item>
+        <item name="android:horizontalSpacing">3dp</item>
+    </style>
+    <style name="EffectSettingItem">
+        <item name="android:orientation">vertical</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingTop">9dp</item>
+        <item name="android:paddingBottom">9dp</item>
+        <item name="android:paddingLeft">2dp</item>
+        <item name="android:paddingRight">2dp</item>
+        <item name="android:background">@drawable/setting_picker</item>
+    </style>
+    <style name="EffectSettingItemTitle">
+        <item name="android:textSize">@dimen/effect_setting_item_text_size</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingTop">1dp</item>
+    </style>
 </resources>