diff options
| author | Paul Keith <javelinanddart@gmail.com> | 2018-01-01 18:56:04 +0100 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2018-01-27 00:41:46 +0100 |
| commit | 3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3 (patch) | |
| tree | b920ea140049c355cf12360b73ae5efd04618e71 /src/com/android/camera/ui | |
| parent | eedcecc62459dbebee63d39ed0a07e1bd7733688 (diff) | |
| download | android_packages_apps_Snap-3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3.tar.gz android_packages_apps_Snap-3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3.tar.bz2 android_packages_apps_Snap-3e3cc18dd56c4b795f1cd1476e51a38ab1ea9ef3.zip | |
Revert "Snap: Bring back original shutter icons and animation"
No reason to do use caf ones
This reverts commit a465e3a0cf7a81c7cb9a0e80cbfa7527e7d7de77.
Change-Id: I611351ddfa0b24087cc58466dcba95ab4999d1bd
Diffstat (limited to 'src/com/android/camera/ui')
| -rwxr-xr-x | src/com/android/camera/ui/CameraControls.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/ui/OneUICameraControls.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index 4abe3809c..54355078c 100755 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -1081,7 +1081,7 @@ public class CameraControls extends RotatableLayout { View[] views = { mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher, TsMakeupManager.HAS_TS_MAKEUP ? mTsMakeupSwitcher : mHdrSwitcher,mBokehSwitcher, - mMenu, mShutter, mPreview, mSwitcher, mMute, mReviewRetakeButton, + mMenu, mPreview, mSwitcher, mMute, mReviewRetakeButton, mReviewCancelButton, mReviewDoneButton, mExitPanorama }; for (View v : views) { diff --git a/src/com/android/camera/ui/OneUICameraControls.java b/src/com/android/camera/ui/OneUICameraControls.java index c5daba52f..04c828604 100644 --- a/src/com/android/camera/ui/OneUICameraControls.java +++ b/src/com/android/camera/ui/OneUICameraControls.java @@ -229,7 +229,7 @@ public class OneUICameraControls extends RotatableLayout { mViews = new View[]{ mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher, - mTsMakeupSwitcher, mFlashButton, mShutter, mPreview, mVideoShutter, + mTsMakeupSwitcher, mFlashButton, mPreview, mVideoShutter, mPauseButton, mCancelButton }; mBottomLargeSize = getResources().getDimensionPixelSize( |