Add clear effects button, silly faces title, and background title.

bug:5226051

Change-Id: I61609e31fb8f18041f6885cb923507aeecfd9c9f

7 files changed, 70 insertions, 12 deletions

diff --git a/res/drawable/bg_review_control.xml b/res/drawable/bg_pressed.xml
index 979cc86..979cc86 100644
--- a/res/drawable/bg_review_control.xml
+++ b/res/drawable/bg_pressed.xml
diff --git a/res/layout/effect_setting_popup.xml b/res/layout/effect_setting_popup.xml
index ad22d9f..5fa4ad2 100644
--- a/res/layout/effect_setting_popup.xml
+++ b/res/layout/effect_setting_popup.xml
@@ -13,7 +13,7 @@
      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"
+<com.android.camera.ui.EffectSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
         style="@style/SettingPopupWindow">
 
     <LinearLayout android:orientation="vertical"
@@ -30,12 +30,36 @@
         </FrameLayout>
 
         <View style="@style/PopupTitleSeperator" />
-
-        <FrameLayout android:layout_width="match_parent"
+        <ScrollView
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-            <GridView android:id="@+id/settingList"
-                    style="@style/EffectSettingGrid"
-                    android:choiceMode="singleChoice" />
-        </FrameLayout>
+            <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                <TextView android:id="@+id/clear_effects"
+                        android:text="@string/clear_effects"
+                        style="@style/EffectSettingTypeTitle"
+                        android:textSize="@dimen/effect_setting_clear_text_size"
+                        android:minHeight="@dimen/effect_setting_clear_text_min_height"
+                        android:background="@drawable/bg_pressed"/>
+                <View style="@style/EffectTitleSeparator"/>
+                <TextView
+                        android:text="@string/effect_silly_faces"
+                        style="@style/EffectSettingTypeTitle"/>
+                <com.android.camera.ui.ExpandedGridView android:id="@+id/effect_silly_faces"
+                        style="@style/EffectSettingGrid"/>
+                <View android:id="@+id/effect_background_separator"
+                        android:visibility="gone"
+                        style="@style/EffectTitleSeparator"/>
+                <TextView android:id="@+id/effect_background_title"
+                        android:text="@string/effect_background"
+                        android:visibility="gone"
+                        style="@style/EffectSettingTypeTitle"/>
+                <com.android.camera.ui.ExpandedGridView android:id="@+id/effect_background"
+                        android:visibility="gone"
+                        style="@style/EffectSettingGrid"/>
+            </LinearLayout>
+        </ScrollView>
     </LinearLayout>
-</com.android.camera.ui.BasicSettingPopup>
+</com.android.camera.ui.EffectSettingPopup>
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
index 4859607..a52bafa 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -47,4 +47,9 @@
     <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>
+    <dimen name="effect_setting_type_text_size">21dp</dimen>
+    <dimen name="effect_setting_type_text_min_height">34dp</dimen>
+    <dimen name="effect_setting_clear_text_size">23dp</dimen>
+    <dimen name="effect_setting_clear_text_min_height">44dp</dimen>
+    <dimen name="effect_setting_type_text_left_padding">26dp</dimen>
 </resources>
diff --git a/res/values-w1024dp/styles.xml b/res/values-w1024dp/styles.xml
index a0fd9bd..cda7e86 100644
--- a/res/values-w1024dp/styles.xml
+++ b/res/values-w1024dp/styles.xml
@@ -28,7 +28,7 @@
         <item name="android:visibility">gone</item>
         <item name="android:clickable">true</item>
         <item name="android:focusable">true</item>
-        <item name="android:background">@drawable/bg_review_control</item>
+        <item name="android:background">@drawable/bg_pressed</item>
     </style>
     <style name="ReviewControlIcon">
         <item name="android:layout_height">60dp</item>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 74842b2..f34b2e5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -45,4 +45,9 @@
     <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>
+    <dimen name="effect_setting_type_text_size">18dp</dimen>
+    <dimen name="effect_setting_type_text_min_height">36dp</dimen>
+    <dimen name="effect_setting_clear_text_size">20dp</dimen>
+    <dimen name="effect_setting_clear_text_min_height">36dp</dimen>
+    <dimen name="effect_setting_type_text_left_padding">16dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9ec1baf..39905f9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -323,4 +323,13 @@
 
     <!-- Toast telling users tapping on the viewfinder will take a picture [CHAR LIMIT=65] -->
     <string name="video_snapshot_hint">Take a photo during video recording by tapping on the preview screen.</string>
+
+    <!-- A button in effect setting popup to clear the effect. [CHAR LIMIT=26] -->
+    <string name="clear_effects">Clear effects</string>
+
+    <!-- Title of category for silly face effects. [CHAR LIMIT=26] -->
+    <string name="effect_silly_faces">Silly faces</string>
+
+    <!-- Title of category for background replacement effects. [CHAR LIMIT=26] -->
+    <string name="effect_background">Background</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7a5db3f..8a01313 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -44,7 +44,7 @@
         <item name="android:layout_centerHorizontal">true</item>
         <item name="android:clickable">true</item>
         <item name="android:focusable">true</item>
-        <item name="android:background">@drawable/bg_review_control</item>
+        <item name="android:background">@drawable/bg_pressed</item>
     </style>
     <style name="ReviewPlayIcon">
         <item name="android:layout_height">wrap_content</item>
@@ -85,8 +85,6 @@
     <style name="PopupTitleSeperator">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">2dp</item>
-        <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:background">@color/popup_title_color</item>
     </style>
     <style name="SettingItemList">
@@ -187,6 +185,7 @@
         <item name="android:numColumns">3</item>
         <item name="android:verticalSpacing">3dp</item>
         <item name="android:horizontalSpacing">3dp</item>
+        <item name="android:choiceMode">singleChoice</item>
     </style>
     <style name="EffectSettingItem">
         <item name="android:orientation">vertical</item>
@@ -207,4 +206,20 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingTop">1dp</item>
     </style>
+    <style name="EffectSettingTypeTitle">
+        <item name="android:textSize">@dimen/effect_setting_type_text_size</item>
+        <item name="android:gravity">left|center_vertical</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:minHeight">@dimen/effect_setting_type_text_min_height</item>
+        <item name="android:paddingLeft">@dimen/effect_setting_type_text_left_padding</item>
+    </style>
+    <style name="EffectTitleSeparator">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">2dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:background">@android:drawable/divider_horizontal_dark</item>
+    </style>
 </resources>