diff options
author | Arne Coucheron <arco68@gmail.com> | 2017-08-09 08:21:16 +0200 |
---|---|---|
committer | Chippa-a <vusal1372@gmail.com> | 2019-10-25 15:55:25 +0300 |
commit | 97a9ccdafdeeb8e4893b5d1e62f2269dca51aa63 (patch) | |
tree | 41167a9eb4626c6d1b590d16211ad121d6ee391f /src/com/android/camera/PhotoUI.java | |
parent | a7b371bcba70f47d13b1c7b07fb472c93482ce08 (diff) | |
download | android_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/PhotoUI.java')
-rwxr-xr-x | src/com/android/camera/PhotoUI.java | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index e3efacd9f..b63e6525f 100755 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -69,7 +69,6 @@ import com.android.camera.ui.FaceView; import com.android.camera.ui.FocusIndicator; import com.android.camera.ui.ListSubMenu; import com.android.camera.ui.ModuleSwitcher; -import com.android.camera.ui.MenuHelp; import com.android.camera.ui.PieRenderer; import com.android.camera.ui.PieRenderer.PieListener; import com.android.camera.ui.RenderOverlay; @@ -114,7 +113,6 @@ public class PhotoUI implements PieListener, private PhotoMenu mMenu; private ModuleSwitcher mSwitcher; private CameraControls mCameraControls; - private MenuHelp mMenuHelp; private AlertDialog mLocationDialog; private PieRenderer mPieRenderer; @@ -302,7 +300,6 @@ public class PhotoUI implements PieListener, mScreenRatio = CameraUtil.determineRatio(size.x, size.y); calculateMargins(size); mCameraControls.setMargins(mTopMargin, mBottomMargin); - showFirstTimeHelp(); } private void calculateMargins(Point size) { @@ -322,21 +319,6 @@ public class PhotoUI implements PieListener, mOrientationResize = orientation; } - private void showFirstTimeHelp(int topMargin, int bottomMargin) { - mMenuHelp = (MenuHelp) mRootView.findViewById(R.id.menu_help); - 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; - } - } - }); - } - public void setAspectRatio(float ratio) { if (ratio <= 0.0) throw new IllegalArgumentException(); @@ -1292,8 +1274,6 @@ public class PhotoUI implements PieListener, public void setOrientation(int orientation, boolean animation) { mOrientation = orientation; mCameraControls.setOrientation(orientation, animation); - if (mMenuHelp != null) - mMenuHelp.setOrientation(orientation, animation); if (mMenuLayout != null) mMenuLayout.setOrientation(orientation, animation); if (mSubMenuLayout != null) @@ -1359,17 +1339,6 @@ public class PhotoUI implements PieListener, setOrientation(mOrientation, true); } - 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(); - } - } - public void showRefocusDialog() { final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mActivity); int prompt = prefs.getInt(CameraSettings.KEY_REFOCUS_PROMPT, 1); |