<<<<<<<<<<<<<<<<添加预览界面按钮>>>>>>>>>>>>>>>
From de2614f00667af0de5235f1378628a53c1dca488 Mon Sep 17 00:00:00 2001
From: ? < b;襃V>Date: Mon, 9 Apr 2018 09:42:26 +0800
Subject: [PATCH] [feature][MAUI01A][BSP]
---
res/drawable-hdpi/ic_csh_off.png | Bin 0 -> 1739 bytes
res/drawable-hdpi/ic_csh_on.png | Bin 0 -> 1808 bytes
res/layout/camera_controls.xml | 4 ++++
res/values/arrays.xml | 16 ++++++++++++++++
res/values/strings.xml | 2 ++
res/xml/camera_preferences.xml | 8 ++++++++
res/xml/video_preferences.xml | 8 ++++++++
src/com/android/camera/CameraSettings.java | 4 ++++
src/com/android/camera/PhotoMenu.java | 34 ++++++++++++++++++++++++++++++++++
src/com/android/camera/ui/CameraControls.java | 39 ++++++++++++++++++++++++++++++++++-----
10 files changed, 110 insertions(+), 5 deletions(-)
create mode 100644 res/drawable-hdpi/ic_csh_off.png
create mode 100644 res/drawable-hdpi/ic_csh_on.png
mode change 100644 => 100755 res/xml/camera_preferences.xml
mode change 100644 => 100755 res/xml/video_preferences.xml
diff --git a/res/drawable-hdpi/ic_csh_off.png b/res/drawable-hdpi/ic_csh_off.png
new file mode 100644
index 0000000..1a7d4be
Binary files /dev/null and b/res/drawable-hdpi/ic_csh_off.png differ
diff --git a/res/drawable-hdpi/ic_csh_on.png b/res/drawable-hdpi/ic_csh_on.png
new file mode 100644
index 0000000..1ead07d
Binary files /dev/null and b/res/drawable-hdpi/ic_csh_on.png differ
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index b71972d..b88080b 100755
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -88,6 +88,10 @@
android:scaleType="fitCenter" />
<com.android.camera.ui.RotateImageView
+ android:id="@+id/csh_switcher"
+ style="@style/ToggleButton" />
+
+ <com.android.camera.ui.RotateImageView
android:id="@+id/front_back_switcher"
style="@style/ToggleButton" />
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 4066517..76fdd4c 100755
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -547,21 +547,37 @@
<item>@string/pref_camera_id_entry_back</item>
<item>@string/pref_camera_id_entry_front</item>
</array>
+ <array name="camera_id_entries_csh" translatable="false">
+ <item>@string/pref_camera_id_entry_back</item>
+ <item>@string/pref_camera_id_entry_front</item>
+ </array>
<array name="camera_id_labels" translatable="false">
<item>@string/pref_camera_id_label_back</item>
<item>@string/pref_camera_id_label_front</item>
</array>
+ <array name="camera_id_labels_csh" translatable="false">
+ <item>@string/pref_camera_id_label_back</item>
+ <item>@string/pref_camera_id_label_front</item>
+ </array>
<array name="camera_id_icons" translatable="false">
<item>@drawable/ic_switch_back</item>
<item>@drawable/ic_switch_front</item>
</array>
+ <array name="camera_id_icons_csh" translatable="false">
+ <item>@drawable/ic_csh_off</item>
+ <item>@drawable/ic_csh_on</item>
+ </array>
<array name="camera_id_largeicons" translatable="false">
<item>@drawable/ic_switch_back</item>
<item>@drawable/ic_switch_front</item>
</array>
+ <array name="camera_id_largeicons_csh" translatable="false">
+ <item>@drawable/ic_csh_off</item>
+ <item>@drawable/ic_csh_on</item>
+ </array>
<string-array name="pref_video_effect_entries" translatable="false">
<item>@string/effect_none</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b162d47..ade4ce7 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -197,8 +197,10 @@
<!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
<string name="pref_camera_id_title">Choose camera</string>
+ <string name="pref_camera_id_title_csh">Choose camera</string>
<string name="pref_camera_id_default" translatable="false">0</string>
+ <string name="pref_camera_id_default_csh" translatable="false">0</string>
<!-- In select camera setting, back facing camera. [CHAR LIMIT=14] -->
<string name="pref_camera_id_entry_back">Back</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
old mode 100644
new mode 100755
index ad925f1..5d0344d
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -114,6 +114,14 @@
camera:labelList="@array/camera_id_labels"
camera:largeIcons="@array/camera_id_largeicons" />
<IconListPreference
+ camera:key="pref_camera_id_key_csh"
+ camera:defaultValue="@string/pref_camera_id_default_csh"
+ camera:title="@string/pref_camera_id_title_csh"
+ camera:icons="@array/camera_id_icons_csh"
+ camera:entries="@array/camera_id_entries_csh"
+ camera:labelList="@array/camera_id_labels_csh"
+ camera:largeIcons="@array/camera_id_largeicons_csh" />
+ <IconListPreference
camera:key="pref_camera_hdr_key"
camera:defaultValue="@string/pref_camera_hdr_default"
camera:title="@string/pref_camera_scenemode_entry_hdr"
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
old mode 100644
new mode 100755
index 2d9e2fb..baca498
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -89,6 +89,14 @@
camera:labelList="@array/camera_id_labels"
camera:largeIcons="@array/camera_id_largeicons"/>
<IconListPreference
+ camera:key="pref_camera_id_key_csh"
+ camera:defaultValue="@string/pref_camera_id_default_csh"
+ camera:title="@string/pref_camera_id_title_csh"
+ camera:icons="@array/camera_id_icons_csh"
+ camera:entries="@array/camera_id_entries_csh"
+ camera:labelList="@array/camera_id_labels_csh"
+ camera:largeIcons="@array/camera_id_largeicons_csh" />
+ <IconListPreference
camera:key="pref_video_effect_key"
camera:defaultValue="@string/pref_video_effect_default"
camera:title="@string/pref_video_effect_title"
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index 0dff77e..12f1a04 100755
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -71,6 +71,7 @@ public class CameraSettings {
public static final String KEY_TIMER_SOUND_EFFECTS = "pref_camera_timer_sound_key";
public static final String KEY_VIDEO_EFFECT = "pref_video_effect_key";
public static final String KEY_CAMERA_ID = "pref_camera_id_key";
+ public static final String KEY_CSHSWITCHER = "pref_camera_id_key_csh";
public static final String KEY_CAMERA_HDR = "pref_camera_hdr_key";
public static final String KEY_CAMERA_HQ = "pref_camera_hq_key";
public static final String KEY_CAMERA_HDR_PLUS = "pref_camera_hdr_plus_key";
@@ -879,6 +880,8 @@ public class CameraSettings {
(IconListPreference) group.findPreference(KEY_EXPOSURE);
IconListPreference cameraIdPref =
(IconListPreference) group.findPreference(KEY_CAMERA_ID);
+ IconListPreference cameraIdPref_csh =
+ (IconListPreference) group.findPreference(KEY_CSHSWITCHER);
ListPreference videoFlashMode =
group.findPreference(KEY_VIDEOCAMERA_FLASH_MODE);
ListPreference videoEffect = group.findPreference(KEY_VIDEO_EFFECT);
@@ -997,6 +1000,7 @@ public class CameraSettings {
}
if (exposure != null) buildExposureCompensation(group, exposure);
if (cameraIdPref != null) buildCameraId(group, cameraIdPref);
+ if (cameraIdPref_csh != null) buildCameraId(group, cameraIdPref_csh);
if (timeLapseInterval != null) {
resetIfInvalid(timeLapseInterval);
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index 9f1759c..c502445 100755
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -96,6 +96,7 @@ public class PhotoMenu extends MenuController
private View mHdrSwitcher;
private View mTsMakeupSwitcher;
private View mFrontBackSwitcher;
+ private View mCshSwitcher;
private View mSceneModeSwitcher;
private View mFilterModeSwitcher;
private View mCameraSwitcher;
@@ -126,15 +127,43 @@ public class PhotoMenu extends MenuController
mSettingOn = activity.getString(R.string.setting_on_value);
mActivity = activity;
mFrontBackSwitcher = ui.getRootView().findViewById(R.id.front_back_switcher);
+ mCshSwitcher = ui.getRootView().findViewById(R.id.csh_switcher);
mHdrSwitcher = ui.getRootView().findViewById(R.id.hdr_switcher);
mTsMakeupSwitcher = ui.getRootView().findViewById(R.id.ts_makeup_switcher);
mSceneModeSwitcher = ui.getRootView().findViewById(R.id.scene_mode_switcher);
mFilterModeSwitcher = ui.getRootView().findViewById(R.id.filter_mode_switcher);
mMakeupListener = makeupListener;
mSettingMenu = ui.getRootView().findViewById(R.id.menu);
mCameraSwitcher = ui.getRootView().findViewById(R.id.camera_switcher);
mPreviewThumbnail = ui.getRootView().findViewById(R.id.preview_thumb);
}
+ boolean click_click = false;
+ public void initMySwitch() {
+ final IconListPreference pref = (IconListPreference) mPreferenceGroup
+ .findPreference(CameraSettings.KEY_SCENE_MODE);
+ //mCshSwitcher.setVisibility(View.INVISIBLE);
+ ((ImageView) mCshSwitcher).setImageResource(R.drawable.ic_csh_off);
+ mCshSwitcher.setVisibility(View.VISIBLE);
+ mCshSwitcher.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ android.util.Log.e("ccccc", "onclick " + v);
+ if (click_click) {
+ click_click = false;
+ ((ImageView) mCshSwitcher).setImageResource(R.drawable.ic_csh_off);
+ pref.setValueIndex(0);
+ onSettingChanged(pref);
+ updateSceneModeIcon(pref);
+ } else {
+ click_click = true;
+ ((ImageView) mCshSwitcher).setImageResource(R.drawable.ic_csh_on);
+ pref.setValueIndex(8);
+ onSettingChanged(pref);
+ updateSceneModeIcon(pref);
+ }
+ }
+ });
+ }
public void initialize(PreferenceGroup group) {
super.initialize(group);
@@ -166,6 +195,7 @@ public class PhotoMenu extends MenuController
}
mFrontBackSwitcher.setVisibility(View.INVISIBLE);
+ mCshSwitcher.setVisibility(View.INVISIBLE);
if(!TsMakeupManager.HAS_TS_MAKEUP) {
// HDR.
if (group.findPreference(CameraSettings.KEY_CAMERA_HDR) != null) {
@@ -242,6 +272,7 @@ public class PhotoMenu extends MenuController
};
initSwitchItem(CameraSettings.KEY_CAMERA_ID, mFrontBackSwitcher);
+ initMySwitch();
}
protected class MakeupHandler extends Handler {
@@ -1552,19 +1583,22 @@ public class PhotoMenu extends MenuController
mSceneModeSwitcher.setVisibility(View.GONE);
mFilterModeSwitcher.setVisibility(View.GONE);
mFrontBackSwitcher.setVisibility(View.GONE);
+ mCshSwitcher.setVisibility(View.GONE);
mTsMakeupSwitcher.setVisibility(View.GONE);
} else {
mSceneModeSwitcher.setVisibility(View.VISIBLE);
mFilterModeSwitcher.setVisibility(View.VISIBLE);
mFrontBackSwitcher.setVisibility(View.VISIBLE);
+ mCshSwitcher.setVisibility(View.VISIBLE);
mTsMakeupSwitcher.setVisibility(View.VISIBLE);
}
}
public void hideCameraControls(boolean hide) {
final int status = (hide) ? View.INVISIBLE : View.VISIBLE;
mSettingMenu.setVisibility(status);
mFrontBackSwitcher.setVisibility(status);
+ mCshSwitcher.setVisibility(status);
if (TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setVisibility(status);
} else {
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index 95b660d..ee40c88 100755
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -47,15 +47,15 @@ import com.android.camera.TsMakeupManager;
public class CameraControls extends RotatableLayout {
- private static final String TAG = "CAM_Controls";
-
+ private static final String TAG = "csh";
private View mBackgroundView;
private View mShutter;
private View mVideoShutter;
private View mSwitcher;
private View mMenu;
private View mMute;
private View mFrontBackSwitcher;
+ private View mCshSwitcher;
private View mHdrSwitcher;
private View mTsMakeupSwitcher;
private View mIndicators;
@@ -73,6 +73,7 @@ public class CameraControls extends RotatableLayout {
private static boolean isAnimating = false;
private ArrayList<View> mViewList;
private static final int FRONT_BACK_INDEX = 0;
+ private static final int CSH_INDEX = 11;
private static final int HDR_INDEX = 1;
private static final int TS_MAKEUP_INDEX = 1;
private static final int SCENE_MODE_INDEX = 2;
@@ -85,8 +86,8 @@ public class CameraControls extends RotatableLayout {
private static final int MUTE_INDEX = 9;
private static final int VIDEO_SHUTTER_INDEX = 10;
private static final int ANIME_DURATION = 300;
- private float[][] mLocX = new float[4][11];
- private float[][] mLocY = new float[4][11];
+ private float[][] mLocX = new float[4][13];
+ private float[][] mLocY = new float[4][13];
private boolean mLocSet = false;
private boolean mHideRemainingPhoto = false;
private LinearLayout mRemainingPhotos;
@@ -118,6 +119,7 @@ public class CameraControls extends RotatableLayout {
resetLocation(0, 0);
mFrontBackSwitcher.setVisibility(View.INVISIBLE);
+ mCshSwitcher.setVisibility(View.INVISIBLE);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setVisibility(View.INVISIBLE);
} else {
@@ -142,6 +144,7 @@ public class CameraControls extends RotatableLayout {
resetLocation(0, 0);
mFrontBackSwitcher.setVisibility(View.INVISIBLE);
+ mCshSwitcher.setVisibility(View.INVISIBLE);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setVisibility(View.INVISIBLE);
} else {
@@ -216,6 +219,7 @@ public class CameraControls extends RotatableLayout {
mMenu.setPressed(false);
mMute.setPressed(false);
mFrontBackSwitcher.setPressed(false);
+ mCshSwitcher.setPressed(false);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setPressed(false);
} else {
@@ -231,6 +235,7 @@ public class CameraControls extends RotatableLayout {
mMenu.setEnabled(enable);
mMute.setEnabled(enable);
mFrontBackSwitcher.setEnabled(enable);
+ mCshSwitcher.setEnabled(enable);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setClickable(false);
} else {
@@ -245,6 +250,8 @@ public class CameraControls extends RotatableLayout {
mViewList = new ArrayList<View>();
if (mFrontBackSwitcher.getVisibility() == View.VISIBLE)
mViewList.add(mFrontBackSwitcher);
+ if (mCshSwitcher.getVisibility() == View.VISIBLE)
+ mViewList.add(mCshSwitcher);
if(TsMakeupManager.HAS_TS_MAKEUP) {
if (mTsMakeupSwitcher.getVisibility() == View.VISIBLE)
mViewList.add(mTsMakeupSwitcher);
@@ -284,6 +291,7 @@ public class CameraControls extends RotatableLayout {
mShutter = findViewById(R.id.shutter_button);
mVideoShutter = findViewById(R.id.video_button);
mFrontBackSwitcher = findViewById(R.id.front_back_switcher);
+ mCshSwitcher = findViewById(R.id.csh_switcher);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher = findViewById(R.id.ts_makeup_switcher);
} else {
@@ -300,6 +308,7 @@ public class CameraControls extends RotatableLayout {
mCamera2 = findViewById(R.id.camera2);
}
+
@Override
public void onLayout(boolean changed, int l, int t, int r, int b) {
int orientation = getResources().getConfiguration().orientation;
@@ -375,6 +384,7 @@ public class CameraControls extends RotatableLayout {
toIndex(mMute, w, h, rotation, 3, 0, MUTE_INDEX);
toIndex(mIndicators, w, h, rotation, 0, 6, INDICATOR_INDEX);
toIndex(mFrontBackSwitcher, w, h, rotation, 2, 0, FRONT_BACK_INDEX);
+ toIndex(mCshSwitcher, w, h, rotation, 3, 6, CSH_INDEX);
toIndex(mPreview, w, h, rotation, 0, 6, PREVIEW_INDEX);
if(TsMakeupManager.HAS_TS_MAKEUP) {
toIndex(mTsMakeupSwitcher, w, h, rotation, 3, 0, TS_MAKEUP_INDEX);
@@ -472,8 +482,10 @@ public class CameraControls extends RotatableLayout {
private void resetLocation(float x, float y) {
int rotation = getUnifiedRotation();
int idx1 = rotation / 90;
+ Log.d(TAG, "resetLocation");
mFrontBackSwitcher.setX(mLocX[idx1][FRONT_BACK_INDEX] + x);
+ mCshSwitcher.setX(mLocX[idx1][CSH_INDEX] - x);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setX(mLocX[idx1][TS_MAKEUP_INDEX] + x);
} else {
@@ -490,6 +502,7 @@ public class CameraControls extends RotatableLayout {
mPreview.setX(mLocX[idx1][PREVIEW_INDEX] - x);
mFrontBackSwitcher.setY(mLocY[idx1][FRONT_BACK_INDEX] + y);
+ mCshSwitcher.setY(mLocY[idx1][CSH_INDEX] - y);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setY(mLocY[idx1][TS_MAKEUP_INDEX] + y);
} else {
@@ -508,6 +521,7 @@ public class CameraControls extends RotatableLayout {
public void setTitleBarVisibility(int status){
mFrontBackSwitcher.setVisibility(status);
+ mCshSwitcher.setVisibility(status);
mMenu.setVisibility(status);
mSceneModeSwitcher.setVisibility(status);
mFilterModeSwitcher.setVisibility(status);
@@ -524,6 +538,7 @@ public class CameraControls extends RotatableLayout {
isAnimating = true;
int rotation = getUnifiedRotation();
mFrontBackSwitcher.animate().cancel();
+ mCshSwitcher.animate().cancel();
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.animate().cancel();
} else {
@@ -539,12 +554,14 @@ public class CameraControls extends RotatableLayout {
mIndicators.animate().cancel();
mPreview.animate().cancel();
mFrontBackSwitcher.animate().setListener(outlistener);
+ mCshSwitcher.animate().setListener(outlistener);
((ModuleSwitcher) mSwitcher).removePopup();
resetLocation(0, 0);
markVisibility();
switch (rotation) {
case 0:
mFrontBackSwitcher.animate().translationYBy(-mSize).setDuration(ANIME_DURATION);
+ mCshSwitcher.animate().translationYBy(mSize).setDuration(ANIME_DURATION);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.animate().translationYBy(-mSize).setDuration(ANIME_DURATION);
} else {
@@ -563,6 +580,7 @@ public class CameraControls extends RotatableLayout {
break;
case 90:
mFrontBackSwitcher.animate().translationXBy(-mSize).setDuration(ANIME_DURATION);
+ mCshSwitcher.animate().translationXBy(mSize).setDuration(ANIME_DURATION);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.animate().translationXBy(-mSize).setDuration(ANIME_DURATION);
} else {
@@ -581,6 +599,7 @@ public class CameraControls extends RotatableLayout {
break;
case 180:
mFrontBackSwitcher.animate().translationYBy(mSize).setDuration(ANIME_DURATION);
+ mCshSwitcher.animate().translationYBy(-mSize).setDuration(ANIME_DURATION);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.animate().translationYBy(mSize).setDuration(ANIME_DURATION);
} else {
@@ -599,6 +618,7 @@ public class CameraControls extends RotatableLayout {
break;
case 270:
mFrontBackSwitcher.animate().translationXBy(mSize).setDuration(ANIME_DURATION);
+ mCshSwitcher.animate().translationXBy(-mSize).setDuration(ANIME_DURATION);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.animate().translationXBy(mSize).setDuration(ANIME_DURATION);
} else {
@@ -626,6 +646,7 @@ public class CameraControls extends RotatableLayout {
isAnimating = true;
int rotation = getUnifiedRotation();
mFrontBackSwitcher.animate().cancel();
+ mCshSwitcher.animate().cancel();
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.animate().cancel();
} else {
@@ -654,11 +675,13 @@ public class CameraControls extends RotatableLayout {
mPreview.setVisibility(View.VISIBLE);
mFrontBackSwitcher.animate().setListener(inlistener);
+ mCshSwitcher.animate().setListener(inlistener);
switch (rotation) {
case 0:
resetLocation(0, -mSize);
mFrontBackSwitcher.animate().translationYBy(mSize).setDuration(ANIME_DURATION);
+ mCshSwitcher.animate().translationYBy(-mSize).setDuration(ANIME_DURATION);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.animate().translationYBy(mSize).setDuration(ANIME_DURATION);
} else {
@@ -679,6 +702,7 @@ public class CameraControls extends RotatableLayout {
resetLocation(-mSize, 0);
mFrontBackSwitcher.animate().translationXBy(mSize).setDuration(ANIME_DURATION);
+ mCshSwitcher.animate().translationXBy(-mSize).setDuration(ANIME_DURATION);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.animate().translationXBy(mSize).setDuration(ANIME_DURATION);
} else {
@@ -699,6 +723,7 @@ public class CameraControls extends RotatableLayout {
resetLocation(0, mSize);
mFrontBackSwitcher.animate().translationYBy(-mSize).setDuration(ANIME_DURATION);
+ mCshSwitcher.animate().translationYBy(mSize).setDuration(ANIME_DURATION);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.animate().translationYBy(-mSize).setDuration(ANIME_DURATION);
} else {
@@ -719,6 +744,7 @@ public class CameraControls extends RotatableLayout {
resetLocation(mSize, 0);
mFrontBackSwitcher.animate().translationXBy(-mSize).setDuration(ANIME_DURATION);
+ mCshSwitcher.animate().translationXBy(mSize).setDuration(ANIME_DURATION);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.animate().translationXBy(-mSize).setDuration(ANIME_DURATION);
} else {
@@ -765,6 +791,7 @@ public class CameraControls extends RotatableLayout {
int hnumber = HEIGHT_GRID;
int windex = 0;
int hindex = 0;
+ Log.d(TAG, "toIndex View = " + v + " || rotation = "+ rotation);
switch (rotation) {
case 0:
// portrait, to left of anchor at bottom
@@ -1000,7 +1027,7 @@ public class CameraControls extends RotatableLayout {
public void setOrientation(int orientation, boolean animation) {
mOrientation = orientation;
View[] views = {
- mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,
+ mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,mCshSwitcher,
TsMakeupManager.HAS_TS_MAKEUP ? mTsMakeupSwitcher : mHdrSwitcher,
mMenu, mShutter, mPreview, mSwitcher, mMute, mReviewRetakeButton,
mReviewCancelButton, mReviewDoneButton
@@ -1016,6 +1043,7 @@ public class CameraControls extends RotatableLayout {
public void hideCameraSettings() {
mFrontBackSwitcher.setVisibility(View.INVISIBLE);
+ mCshSwitcher.setVisibility(View.INVISIBLE);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setVisibility(View.INVISIBLE);
} else {
@@ -1028,6 +1056,7 @@ public class CameraControls extends RotatableLayout {
public void showCameraSettings() {
mFrontBackSwitcher.setVisibility(View.VISIBLE);
+ mCshSwitcher.setVisibility(View.VISIBLE);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setVisibility(View.VISIBLE);
} else {
--
libgit2 0.24.0