diff --git a/packages/apps/SnapdragonCamera/res/layout/camera_controls.xml b/packages/apps/SnapdragonCamera/res/layout/camera_controls.xml
index 5e33709..a406ea0 100755
--- a/packages/apps/SnapdragonCamera/res/layout/camera_controls.xml
+++ b/packages/apps/SnapdragonCamera/res/layout/camera_controls.xml
@@ -92,6 +92,10 @@
android:contentDescription="@string/switch_photo_filmstrip"
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/packages/apps/SnapdragonCamera/src/com/android/camera/PhotoMenu.java b/packages/apps/SnapdragonCamera/src/com/android/camera/PhotoMenu.java
index b59575e..2deed86 100644
--- a/packages/apps/SnapdragonCamera/src/com/android/camera/PhotoMenu.java
+++ b/packages/apps/SnapdragonCamera/src/com/android/camera/PhotoMenu.java
@@ -106,6 +106,7 @@ public class PhotoMenu extends MenuController
private View mCameraSwitcher;
private View mSettingMenu;
private View mPreviewThumbnail;
+ private View mCshSwitcher;
private PhotoUI mUI;
private int mPopupStatus;
private int mPreviewMenuStatus;
@@ -140,6 +141,7 @@ public class PhotoMenu extends MenuController
mSettingMenu = ui.getRootView().findViewById(R.id.menu);
mCameraSwitcher = ui.getRootView().findViewById(R.id.camera_switcher);
mPreviewThumbnail = ui.getRootView().findViewById(R.id.preview_thumb);
+ mCshSwitcher = ui.getRootView().findViewById(R.id.csh_switcher);
}
public void initialize(PreferenceGroup group) {
@@ -163,6 +165,7 @@ public class PhotoMenu extends MenuController
}
}
+
initSceneModeButton(mSceneModeSwitcher);
initFilterModeButton(mFilterModeSwitcher);
if(TsMakeupManager.HAS_TS_MAKEUP) {
@@ -173,10 +176,14 @@ public class PhotoMenu extends MenuController
initBokehModeButton(mBokehSwitcher);
mFrontBackSwitcher.setVisibility(View.INVISIBLE);
+ mCshSwitcher.setVisibility(View.INVISIBLE);
+ initMySwitch(CameraSettings.KEY_CAMERA_ID, mCshSwitcher);
+
+
if(!TsMakeupManager.HAS_TS_MAKEUP) {
// HDR.
if (group.findPreference(CameraSettings.KEY_CAMERA_HDR) != null) {
- mHdrSwitcher.setVisibility(View.VISIBLE);
+ //mHdrSwitcher.setVisibility(View.VISIBLE);
initSwitchItem(CameraSettings.KEY_CAMERA_HDR, mHdrSwitcher);
} else {
mHdrSwitcher.setVisibility(View.INVISIBLE);
@@ -780,7 +787,7 @@ public class PhotoMenu extends MenuController
mHdrSwitcher.setVisibility(View.GONE);
mUI.getCameraControls().removeFromViewList(mHdrSwitcher);
} else {
- mHdrSwitcher.setVisibility(View.VISIBLE);
+ // mHdrSwitcher.setVisibility(View.VISIBLE);
}
pref = mPreferenceGroup.findPreference(CameraSettings.KEY_BOKEH_MODE);
@@ -853,6 +860,20 @@ public class PhotoMenu extends MenuController
}
((ImageView) switcher).setImageResource(resid);
switcher.setVisibility(View.VISIBLE);
+
+ Log.e(TAG,"cfw---3="+index);
+ if(index==2 || index== 1 ){
+ mCshSwitcher.setVisibility(View.GONE);
+ mHdrSwitcher.setVisibility(View.VISIBLE);
+ Log.e(TAG,"cfw---1="+index);
+ }
+ if(index == 0){
+ Log.e(TAG,"cfw---2="+index);
+ mCshSwitcher.setVisibility(View.VISIBLE);
+ mHdrSwitcher.setVisibility(View.GONE);
+ mUI.getCameraControls().removeFromViewList(mHdrSwitcher);
+ }
+
mPreferences.add(pref);
mPreferenceMap.put(pref, switcher);
switcher.setOnClickListener(new OnClickListener() {
@@ -870,7 +891,21 @@ public class PhotoMenu extends MenuController
}
int index = pref.findIndexOfValue(pref.getValue());
CharSequence[] values = pref.getEntryValues();
+ Log.e(TAG,"cfw--"+"pref.getValue()="+pref.getValue()+"-index="+index+"--"+values.length);
index = (index + 1) % values.length;
+ Log.e(TAG,"cfw-2-index="+index);
+ if(index==2 ){
+ index=0;
+ }
+ /*if(index==2 && click_click){
+ //点击广角后再点击切换前后摄按钮转到前摄，点击了广角设为true，点击前后摄设为false
+ index=0;
+ }*/
+ if(index==1 && prefKey.equals(CameraSettings.KEY_CAMERA_ID)){
+ index=2;
+ }
+ //click_click=false;
+
pref.setValueIndex(index);
((ImageView) v).setImageResource(
((IconListPreference) pref).getLargeIconIds()[index]);
@@ -881,6 +916,51 @@ public class PhotoMenu extends MenuController
}
});
}
+
+ boolean click_click = false;
+ public void initMySwitch(final String prefKey, View switcher) {
+ final IconListPreference pref =
+ (IconListPreference) mPreferenceGroup.findPreference(prefKey);
+ if (pref == null)
+ return;
+
+ ((ImageView) mCshSwitcher).setImageResource(R.drawable.ic_switch_photo_facing_holo_light);
+
+ switcher.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ IconListPreference pref = (IconListPreference) mPreferenceGroup
+ .findPreference(prefKey);
+ if (pref == null)
+ return;
+ if (prefKey.equals(CameraSettings.KEY_CAMERA_ID)) {
+ // Hide the camera control while switching the camera.
+ // The camera control will be added back when
+ // onCameraPickerClicked is completed
+ //mUI.hideUI();
+ }
+ int index = 1;
+ //click_click=true;
+ /*CharSequence[] values = pref.getEntryValues();
+ Log.e(TAG,"cfw-111-"+"pref.getValue()="+pref.getValue()+"-index="+index+"--"+values.length);
+ index = (index + 1) % values.length;
+ Log.e(TAG,"cfw-112-index="+index);
+ if(index !=1 && prefKey.equals(CameraSettings.KEY_CAMERA_ID)){
+ index = 1;
+ }*/
+ pref.setValueIndex(index);
+ // ((ImageView) v).setImageResource(
+ // ((IconListPreference) pref).getLargeIconIds()[index]);
+ if (prefKey.equals(CameraSettings.KEY_CAMERA_ID))
+ mListener.onCameraPickerClicked(index);
+ reloadPreference(pref);
+ onSettingChanged(pref);
+
+ switcher.setVisibility(View.INVISIBLE);
+ mHdrSwitcher.setVisibility(View.VISIBLE);
+ }
+ });
+ }
public void initBokehModeButton(View button) {
button.setVisibility(View.INVISIBLE);
@@ -1571,7 +1651,7 @@ public class PhotoMenu extends MenuController
mHdrSwitcher.setVisibility(View.GONE);
mUI.getCameraControls().removeFromViewList(mHdrSwitcher);
} else {
- mHdrSwitcher.setVisibility(View.VISIBLE);
+ //mHdrSwitcher.setVisibility(View.VISIBLE);
}
updateFilterModeIcon(pref, pref);
@@ -1597,14 +1677,16 @@ public class PhotoMenu extends MenuController
public void hideTopMenu(boolean hide) {
if (hide) {
- mSceneModeSwitcher.setVisibility(View.GONE);
+ 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);
}
}
@@ -1613,11 +1695,13 @@ public class PhotoMenu extends MenuController
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 {
mHdrSwitcher.setVisibility(status);
}
+ Log.e(TAG,"cfw--hideCameraControls");
mSceneModeSwitcher.setVisibility(status);
mFilterModeSwitcher.setVisibility(status);
if(status == View.INVISIBLE) {
diff --git a/packages/apps/SnapdragonCamera/src/com/android/camera/VideoMenu.java b/packages/apps/SnapdragonCamera/src/com/android/camera/VideoMenu.java
index 6453ecf..318a92c 100755
--- a/packages/apps/SnapdragonCamera/src/com/android/camera/VideoMenu.java
+++ b/packages/apps/SnapdragonCamera/src/com/android/camera/VideoMenu.java
@@ -80,6 +80,7 @@ public class VideoMenu extends MenuController
private int mSceneStatus;
private View mFrontBackSwitcher;
private View mFilterModeSwitcher;
+ private View mCshSwitcher;
private int mPopupStatus;
private int mPreviewMenuStatus;
private CameraActivity mActivity;
@@ -99,6 +100,7 @@ public class VideoMenu extends MenuController
mActivity = activity;
mFrontBackSwitcher = ui.getRootView().findViewById(R.id.front_back_switcher);
mFilterModeSwitcher = ui.getRootView().findViewById(R.id.filter_mode_switcher);
+ mCshSwitcher = ui.getRootView().findViewById(R.id.csh_switcher);
}
public void initialize(PreferenceGroup group) {
@@ -108,6 +110,8 @@ public class VideoMenu extends MenuController
mPopupStatus = POPUP_NONE;
mPreviewMenuStatus = POPUP_NONE;
initFilterModeButton(mFilterModeSwitcher);
+ //mCshSwitcher.setVisibility(View.INVISIBLE);
+ initMySwitch(CameraSettings.KEY_CAMERA_ID, mCshSwitcher);
// settings popup
mOtherKeys1 = new String[] {
CameraSettings.KEY_VIDEOCAMERA_FLASH_MODE,
@@ -482,6 +486,17 @@ public class VideoMenu extends MenuController
resid = pref.getSingleIcon();
}
((ImageView) switcher).setImageResource(resid);
+
+
+ if(index == 2 || index== 1 ){
+ mCshSwitcher.setVisibility(View.GONE);
+ mUI.getCameraControls().removeFromViewList(mCshSwitcher);
+ Log.e(TAG,"cfw--index="+index);
+ }
+ if(index == 0){
+ mCshSwitcher.setVisibility(View.VISIBLE);
+ }
+
mPreferences.add(pref);
mPreferenceMap.put(pref, switcher);
switcher.setOnClickListener(new OnClickListener() {
@@ -494,6 +509,17 @@ public class VideoMenu extends MenuController
int index = pref.findIndexOfValue(pref.getValue());
CharSequence[] values = pref.getEntryValues();
index = (index + 1) % values.length;
+ if(index==2 ){
+ index=0;
+ }
+ /*if(index==2 && click_click){
+ //点击了广角设为true，点击前后摄设为false
+ index=0;
+ }*/
+ if(index==1 && prefKey.equals(CameraSettings.KEY_CAMERA_ID)){
+ index=2;
+ }
+ //click_click=false;
pref.setValueIndex(index);
((ImageView) v).setImageResource(
((IconListPreference) pref).getLargeIconIds()[index]);
@@ -504,6 +530,41 @@ public class VideoMenu extends MenuController
}
});
}
+
+ boolean click_click = false;
+ public void initMySwitch(final String prefKey, View switcher) {
+ final IconListPreference pref =
+ (IconListPreference) mPreferenceGroup.findPreference(prefKey);
+ if (pref == null)
+ return;
+
+ ((ImageView) mCshSwitcher).setImageResource(R.drawable.ic_switch_photo_facing_holo_light);
+
+ switcher.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ IconListPreference pref = (IconListPreference) mPreferenceGroup
+ .findPreference(prefKey);
+ if (pref == null)
+ return;
+ if (prefKey.equals(CameraSettings.KEY_CAMERA_ID)) {
+ // Hide the camera control while switching the camera.
+ // The camera control will be added back when
+ // onCameraPickerClicked is completed
+ //mUI.hideUI();
+ }
+ int index = 1;
+ //click_click=true;
+ pref.setValueIndex(index);
+ if (prefKey.equals(CameraSettings.KEY_CAMERA_ID))
+ mListener.onCameraPickerClicked(index);
+ reloadPreference(pref);
+ onSettingChanged(pref);
+
+ switcher.setVisibility(View.GONE);
+ }
+ });
+ }
public void initFilterModeButton(View button) {
button.setVisibility(View.INVISIBLE);
@@ -863,10 +924,12 @@ public class VideoMenu extends MenuController
public void hideUI() {
mFrontBackSwitcher.setVisibility(View.INVISIBLE);
mFilterModeSwitcher.setVisibility(View.INVISIBLE);
+ mCshSwitcher.setVisibility(View.INVISIBLE);
}
public void showUI() {
mFrontBackSwitcher.setVisibility(View.VISIBLE);
+ mCshSwitcher.setVisibility(View.VISIBLE);
final IconListPreference pref = (IconListPreference) mPreferenceGroup
.findPreference(CameraSettings.KEY_FILTER_MODE);
if (pref != null) {
diff --git a/packages/apps/SnapdragonCamera/src/com/android/camera/VideoUI.java b/packages/apps/SnapdragonCamera/src/com/android/camera/VideoUI.java
index 2b1b73b..75fd151 100755
--- a/packages/apps/SnapdragonCamera/src/com/android/camera/VideoUI.java
+++ b/packages/apps/SnapdragonCamera/src/com/android/camera/VideoUI.java
@@ -281,6 +281,7 @@ public class VideoUI implements PieRenderer.PieListener,
initializePauseButton();
mCameraControls = (CameraControls) mRootView.findViewById(R.id.camera_controls);
+ mCameraControls.isVideoModule=true;
ViewStub faceViewStub = (ViewStub) mRootView
.findViewById(R.id.face_view_stub);
if (faceViewStub != null) {
@@ -299,6 +300,10 @@ public class VideoUI implements PieRenderer.PieListener,
mCameraControls.setMargins(mTopMargin, mBottomMargin);
((ViewGroup)mRootView).removeView(mRecordingTimeRect);
}
+
+ public CameraControls getCameraControls() {
+ return mCameraControls;
+ }
private void calculateMargins(Point size) {
int l = size.x > size.y ? size.x : size.y;
diff --git a/packages/apps/SnapdragonCamera/src/com/android/camera/ui/CameraControls.java b/packages/apps/SnapdragonCamera/src/com/android/camera/ui/CameraControls.java
index eb69aa3..2513983 100755
--- a/packages/apps/SnapdragonCamera/src/com/android/camera/ui/CameraControls.java
+++ b/packages/apps/SnapdragonCamera/src/com/android/camera/ui/CameraControls.java
@@ -57,6 +57,7 @@ public class CameraControls extends RotatableLayout {
private View mMenu;
private View mMute;
private View mFrontBackSwitcher;
+ private View mCshSwitcher;
private View mHdrSwitcher;
private View mTsMakeupSwitcher;
private View mBokehSwitcher;
@@ -75,6 +76,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 = 13;
private static final int HDR_INDEX = 1;
private static final int TS_MAKEUP_INDEX = 1;
private static final int SCENE_MODE_INDEX = 2;
@@ -88,7 +90,7 @@ public class CameraControls extends RotatableLayout {
private static final int VIDEO_SHUTTER_INDEX = 10;
private static final int EXIT_PANORAMA_INDEX = 11;
private static final int BOKEH_INDEX = 12;
- private static final int MAX_INDEX= 13;
+ private static final int MAX_INDEX= 14;
private static final int ANIME_DURATION = 300;
private float[][] mLocX = new float[4][MAX_INDEX];
private float[][] mLocY = new float[4][MAX_INDEX];
@@ -109,6 +111,8 @@ public class CameraControls extends RotatableLayout {
private static final int HIGH_REMAINING_PHOTOS = 1000000;
private boolean mIsBokehMode = false;
+ public boolean isVideoModule = false;
+
AnimatorListener outlistener = new AnimatorListener() {
@Override
@@ -125,6 +129,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 {
@@ -152,6 +157,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 {
@@ -234,6 +240,7 @@ public class CameraControls extends RotatableLayout {
mMute.setPressed(false);
mExitPanorama.setPressed(false);
mFrontBackSwitcher.setPressed(false);
+ mCshSwitcher.setPressed(false);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setPressed(false);
} else {
@@ -253,6 +260,7 @@ public class CameraControls extends RotatableLayout {
mMute.setEnabled(enable);
mExitPanorama.setEnabled(enable);
mFrontBackSwitcher.setEnabled(enable);
+ mCshSwitcher.setEnabled(enable);
if(TsMakeupManager.HAS_TS_MAKEUP) {
mTsMakeupSwitcher.setEnabled(enable);
} else {
@@ -269,6 +277,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);
@@ -313,6 +323,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 {
@@ -411,6 +422,12 @@ public class CameraControls extends RotatableLayout {
toIndex(mExitPanorama, w, h, rotation, 0, 0, EXIT_PANORAMA_INDEX);
toIndex(mIndicators, w, h, rotation, 0, 6, INDICATOR_INDEX);
toIndex(mFrontBackSwitcher, w, h, rotation, 2, 0, FRONT_BACK_INDEX);
+ if(isVideoModule){
+ toIndex(mCshSwitcher, w, h, rotation, 0, 0, CSH_INDEX);
+ }else{
+ toIndex(mCshSwitcher, w, h, rotation, 3, 0, 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);
@@ -510,6 +527,7 @@ public class CameraControls extends RotatableLayout {
int idx1 = rotation / 90;
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 {
@@ -530,6 +548,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 {
@@ -552,7 +571,9 @@ public class CameraControls extends RotatableLayout {
public void setTitleBarVisibility(int status){
mFrontBackSwitcher.setVisibility(status);
+ mCshSwitcher.setVisibility(status);
mMenu.setVisibility(status);
+ Log.e(TAG,"cfw--setTitleBarVisibility");
mSceneModeSwitcher.setVisibility(status);
mFilterModeSwitcher.setVisibility(status);
if(TsMakeupManager.HAS_TS_MAKEUP) {
@@ -582,6 +603,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 {
@@ -601,12 +623,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 {
@@ -629,6 +653,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 {
@@ -651,6 +676,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 {
@@ -673,6 +699,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 {
@@ -704,6 +731,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 {
@@ -736,11 +764,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 {
@@ -765,6 +795,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 {
@@ -789,6 +820,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 {
@@ -813,6 +845,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 {
@@ -1098,7 +1131,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,mBokehSwitcher,
mMenu, mShutter, mPreview, mSwitcher, mMute, mReviewRetakeButton,
mReviewCancelButton, mReviewDoneButton, mExitPanorama
@@ -1114,6 +1147,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 {
@@ -1122,6 +1156,7 @@ public class CameraControls extends RotatableLayout {
if (mIsBokehMode) {
mBokehSwitcher.setVisibility(View.INVISIBLE);
}
+ Log.e(TAG,"cfw--hideCameraSettings");
mSceneModeSwitcher.setVisibility(View.INVISIBLE);
mFilterModeSwitcher.setVisibility(View.INVISIBLE);
mMenu.setVisibility(View.INVISIBLE);
@@ -1129,6 +1164,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 {
diff --git a/vendor/qcom/proprietary/common/restriction_checker/config.pyc b/vendor/qcom/proprietary/common/restriction_checker/config.pyc
index 0e3bdae..c526263 100644
Binary files a/vendor/qcom/proprietary/common/restriction_checker/config.pyc and b/vendor/qcom/proprietary/common/restriction_checker/config.pyc differ
