Merge "SnapdragonCamera:Modify beautify interface" into camera.lnx.1.0-dev.1.0

9 files changed, 89 insertions, 21 deletions

diff --git a/res/drawable-hdpi/bar_beautify_rectangle_blue.png b/res/drawable-hdpi/bar_beautify_rectangle_blue.png
new file mode 100755
index 000000000..37b6cdafb
--- /dev/null
+++ b/res/drawable-hdpi/bar_beautify_rectangle_blue.png
diff --git a/res/drawable-hdpi/bar_beautify_rectangle_white.png b/res/drawable-hdpi/bar_beautify_rectangle_white.png
new file mode 100755
index 000000000..06bc65042
--- /dev/null
+++ b/res/drawable-hdpi/bar_beautify_rectangle_white.png
diff --git a/res/drawable-hdpi/ic_beautify_oval.png b/res/drawable-hdpi/ic_beautify_oval.png
new file mode 100755
index 000000000..be86fdc03
--- /dev/null
+++ b/res/drawable-hdpi/ic_beautify_oval.png
diff --git a/res/drawable-mdpi/bar_beautify_rectangle_blue.png b/res/drawable-mdpi/bar_beautify_rectangle_blue.png
new file mode 100755
index 000000000..454787c9c
--- /dev/null
+++ b/res/drawable-mdpi/bar_beautify_rectangle_blue.png
diff --git a/res/drawable-mdpi/bar_beautify_rectangle_white.png b/res/drawable-mdpi/bar_beautify_rectangle_white.png
new file mode 100755
index 000000000..70b4c951f
--- /dev/null
+++ b/res/drawable-mdpi/bar_beautify_rectangle_white.png
diff --git a/res/drawable-mdpi/ic_beautify_oval.png b/res/drawable-mdpi/ic_beautify_oval.png
new file mode 100755
index 000000000..373a99a28
--- /dev/null
+++ b/res/drawable-mdpi/ic_beautify_oval.png
diff --git a/res/drawable/beautify_progressbar_style.xml b/res/drawable/beautify_progressbar_style.xml
new file mode 100755
index 000000000..962d8dedb
--- /dev/null
+++ b/res/drawable/beautify_progressbar_style.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2016, 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background"
+          android:drawable="@drawable/bar_beautify_rectangle_white" />
+    <item android:id="@android:id/progress">
+        <clip android:drawable="@drawable/bar_beautify_rectangle_blue" />
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml
index de6c8b401..d87040cde 100644..100755
--- a/res/layout/one_ui_layout.xml
+++ b/res/layout/one_ui_layout.xml
@@ -96,42 +96,53 @@
         android:id="@+id/makeup_seekbar_layout"
         android:visibility="gone">
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
+            android:layout_width="12dp"
+            android:layout_height="20dp"
+            android:layout_marginLeft="23dp"
+            android:layout_marginRight="23dp"
             android:id="@+id/seekbar_toggle">
         </ImageView>
         <RelativeLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/seekbar_body">
             <com.android.camera.ui.RotateLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
                 android:layout_alignParentLeft="true"
                 android:id="@+id/makeup_low_text">
                 <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/makeup_seekbar_low">
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:textSize="12sp"
+                    android:gravity="center"
+                    android:text="@string/makeup_seekbar_low"
+                    android:textColor="@android:color/white">
                 </TextView>
             </com.android.camera.ui.RotateLayout>
             <SeekBar
-                    android:layout_width="match_parent"
+                    android:layout_width="220dp"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="100dp"
-                    android:paddingRight="100dp"
+                    android:maxHeight="3dip"
+                    android:minHeight="1dip"
+                    android:layout_marginLeft="10dp"
+                    android:layout_toRightOf="@+id/makeup_low_text"
+                    android:progressDrawable="@drawable/beautify_progressbar_style"
+                    android:thumb="@drawable/ic_beautify_oval"
                     android:id="@+id/makeup_seekbar"/>
             <com.android.camera.ui.RotateLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_toRightOf="@+id/makeup_seekbar"
+                android:layout_marginLeft="10dp"
                 android:id="@+id/makeup_high_text">
                 <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/makeup_seekbar_high">
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:textSize="12sp"
+                    android:gravity="center"
+                    android:text="@string/makeup_seekbar_high"
+                    android:textColor="@android:color/white">
                 </TextView>
             </com.android.camera.ui.RotateLayout>
         </RelativeLayout>
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index ed11807da..77100ecfb 100644..100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -280,6 +280,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
             @Override
             public void onClick(View v) {
                 toggleMakeup();
+                updateMenus();
             }
         });
         setMakeupButtonIcon();
@@ -375,8 +376,8 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
         String value = mSettingsManager.getValue(SettingsManager.KEY_MAKEUP);
         if(value != null && !mIsVideoUI) {
             if(value.equals("0")) {
-                mSettingsManager.setValue(SettingsManager.KEY_MAKEUP, "10");
-                mMakeupSeekBar.setProgress(10);
+                mSettingsManager.setValue(SettingsManager.KEY_MAKEUP, "50");
+                mMakeupSeekBar.setProgress(50);
                 mMakeupSeekBarLayout.setVisibility(View.VISIBLE);
                 mSeekbarBody.setVisibility(View.VISIBLE);
                 mSeekbarToggleButton.setImageResource(R.drawable.seekbar_hide);
@@ -491,6 +492,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
                 mFilterLayout = null;
             }
         }
+        updateMenus();
     }
 
     public void openSettingsMenu() {
@@ -558,6 +560,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
             public void onClick(View v) {
                 addFilterMode();
                 adjustOrientation();
+                updateMenus();
             }
         });
     }
@@ -874,9 +877,28 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
 
     public void cleanUpMenus() {
         showUI();
+        updateMenus();
         mActivity.setSystemBarsVisibility(false);
     }
 
+    public void updateMenus() {
+        boolean enableMakeupMenu = true;
+        boolean enableFilterMenu = true;
+        boolean enableSceneMenu = true;
+        String makeupValue = mSettingsManager.getValue(SettingsManager.KEY_MAKEUP);
+        int colorEffect = mSettingsManager.getValueIndex(SettingsManager.KEY_COLOR_EFFECT);
+        if (makeupValue != null && !makeupValue.equals("0")) {
+            enableSceneMenu = false;
+            enableFilterMenu = false;
+        } else if (colorEffect != 0 || mFilterMenuStatus == FILTER_MENU_ON){
+            enableSceneMenu = false;
+            enableMakeupMenu = false;
+        }
+        mMakeupButton.setEnabled(enableMakeupMenu);
+        mFilterModeSwitcher.setEnabled(enableFilterMenu);
+        mSceneModeSwitcher.setEnabled(enableSceneMenu);
+    }
+
     public boolean arePreviewControlsVisible() {
         return !mUIhidden;
     }