diff options
author | junjiez <junjiez@codeaurora.org> | 2016-11-14 16:12:13 +0800 |
---|---|---|
committer | junjiez <junjiez@codeaurora.org> | 2016-11-15 09:47:23 +0800 |
commit | e6e45c4fcd5f99e23fd81aa1d34c37ffb8b16972 (patch) | |
tree | 9c67700b222722d0ca32e36a455cdab6d1b6e4f7 | |
parent | 0beacc39dd10f5f694dc530e18ab9d7ff1977b5b (diff) | |
download | android_packages_apps_Snap-e6e45c4fcd5f99e23fd81aa1d34c37ffb8b16972.tar.gz android_packages_apps_Snap-e6e45c4fcd5f99e23fd81aa1d34c37ffb8b16972.tar.bz2 android_packages_apps_Snap-e6e45c4fcd5f99e23fd81aa1d34c37ffb8b16972.zip |
SnapdragonCamera:Modify beautify interface
Modify beautify interface, make it the same as
the design. Disable FilterMode button and SceneMode
button when beautify is enabled.
Change-Id: I0ba976973ff06df4e17a93c76781127dda090416
CRs-Fixed: 1084369
-rwxr-xr-x | res/drawable-hdpi/bar_beautify_rectangle_blue.png | bin | 0 -> 177 bytes | |||
-rwxr-xr-x | res/drawable-hdpi/bar_beautify_rectangle_white.png | bin | 0 -> 213 bytes | |||
-rwxr-xr-x | res/drawable-hdpi/ic_beautify_oval.png | bin | 0 -> 699 bytes | |||
-rwxr-xr-x | res/drawable-mdpi/bar_beautify_rectangle_blue.png | bin | 0 -> 125 bytes | |||
-rwxr-xr-x | res/drawable-mdpi/bar_beautify_rectangle_white.png | bin | 0 -> 133 bytes | |||
-rwxr-xr-x | res/drawable-mdpi/ic_beautify_oval.png | bin | 0 -> 348 bytes | |||
-rwxr-xr-x | res/drawable/beautify_progressbar_style.xml | 35 | ||||
-rwxr-xr-x[-rw-r--r--] | res/layout/one_ui_layout.xml | 49 | ||||
-rwxr-xr-x[-rw-r--r--] | src/com/android/camera/CaptureUI.java | 26 |
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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 Binary files differnew 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 2a87b6cd2..d2a4f04f9 100644..100755 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -91,42 +91,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 ae67007d0..138ef84fc 100644..100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -279,6 +279,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, @Override public void onClick(View v) { toggleMakeup(); + updateMenus(); } }); setMakeupButtonIcon(); @@ -368,8 +369,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); @@ -478,6 +479,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, mFilterLayout = null; } } + updateMenus(); } public void openSettingsMenu() { @@ -542,6 +544,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, public void onClick(View v) { addFilterMode(); adjustOrientation(); + updateMenus(); } }); } @@ -859,9 +862,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; } |