summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureUI.java
diff options
context:
space:
mode:
authorArne Coucheron <arco68@gmail.com>2017-08-09 08:21:16 +0200
committerChippa-a <vusal1372@gmail.com>2019-10-25 15:55:25 +0300
commit97a9ccdafdeeb8e4893b5d1e62f2269dca51aa63 (patch)
tree41167a9eb4626c6d1b590d16211ad121d6ee391f /src/com/android/camera/CaptureUI.java
parenta7b371bcba70f47d13b1c7b07fb472c93482ce08 (diff)
downloadandroid_packages_apps_Snap-97a9ccdafdeeb8e4893b5d1e62f2269dca51aa63.tar.gz
android_packages_apps_Snap-97a9ccdafdeeb8e4893b5d1e62f2269dca51aa63.tar.bz2
android_packages_apps_Snap-97a9ccdafdeeb8e4893b5d1e62f2269dca51aa63.zip
Snap: Remove "help screen on first start" feature
Revert "SnapdragonCamera: Add help menu to camera2" This reverts commit 0dbfdffc9994a17e60c57b17c3cc5743cc75e155. Change-Id: Icb4e4bbc2b7883fa232483615a18d3197b2577bd Revert "SnapdragonCamera: Move help menu string to ressource" This reverts commit 901130273dbfc753ef883941a4e93b50056177e4. Change-Id: I82815ee7ef80985c88315c40d6b222f688fd6b75 Revert "SnapdragonCamera: Adding help screen on first start" This reverts commit 666692bf730a1c46210cc74781a56afb4b6fcf28. Change-Id: I8f2ee58c263537c3a02248aa344516f5321de13f
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rwxr-xr-xsrc/com/android/camera/CaptureUI.java33
1 files changed, 0 insertions, 33 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java
index d226faf29..9032069ea 100755
--- a/src/com/android/camera/CaptureUI.java
+++ b/src/com/android/camera/CaptureUI.java
@@ -72,7 +72,6 @@ import com.android.camera.imageprocessor.filter.DeepPortraitFilter;
import com.android.camera.ui.AutoFitSurfaceView;
import com.android.camera.ui.Camera2FaceView;
import com.android.camera.ui.CameraControls;
-import com.android.camera.ui.MenuHelp;
import com.android.camera.ui.OneUICameraControls;
import com.android.camera.ui.CountDownView;
import com.android.camera.ui.FlashToggleButton;
@@ -182,7 +181,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
private FlashToggleButton mFlashButton;
private CountDownView mCountDownView;
private OneUICameraControls mCameraControls;
- private MenuHelp mMenuHelp;
private PieRenderer mPieRenderer;
private ZoomRenderer mZoomRenderer;
private Allocation mMonoDummyAllocation;
@@ -545,7 +543,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
mActivity.setPreviewGestures(mGestures);
mRecordingTimeRect.setVisibility(View.GONE);
- showFirstTimeHelp();
}
protected void showCapturedImageForReview(byte[] jpegData, int orientation) {
@@ -1670,9 +1667,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
public void setOrientation(int orientation, boolean animation) {
mOrientation = orientation;
mCameraControls.setOrientation(orientation, animation);
- if (mMenuHelp != null) {
- mMenuHelp.setOrientation(orientation, animation);
- }
if (mFilterLayout != null) {
ViewGroup vg = (ViewGroup) mFilterLayout.getChildAt(0);
if (vg != null)
@@ -1729,33 +1723,6 @@ public class CaptureUI implements FocusOverlayManager.FocusUI,
return mOrientation;
}
- public void showFirstTimeHelp() {
- final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mActivity);
- boolean isMenuShown = prefs.getBoolean(CameraSettings.KEY_SHOW_MENU_HELP, false);
- if(!isMenuShown) {
- showFirstTimeHelp(mTopMargin, mBottomMargin);
- SharedPreferences.Editor editor = prefs.edit();
- editor.putBoolean(CameraSettings.KEY_SHOW_MENU_HELP, true);
- editor.apply();
- }
- }
-
- private void showFirstTimeHelp(int topMargin, int bottomMargin) {
- mMenuHelp = (MenuHelp) mRootView.findViewById(R.id.menu_help);
- mMenuHelp.setForCamera2(true);
- mMenuHelp.setVisibility(View.VISIBLE);
- mMenuHelp.setMargins(topMargin, bottomMargin);
- mMenuHelp.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (mMenuHelp != null) {
- mMenuHelp.setVisibility(View.GONE);
- mMenuHelp = null;
- }
- }
- });
- }
-
@Override
public void onSingleTapUp(View view, int x, int y) {
mModule.onSingleTapUp(view, x, y);