diff options
| author | jrizzoli <joey@cyanogenmoditalia.it> | 2016-01-07 21:07:51 +0100 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2018-01-26 01:08:31 +0100 |
| commit | a0df98edb234a6f4702e1f01df3b67a243103fd1 (patch) | |
| tree | 240fbe0144590ffc7bd62dbf201803155dd2ad54 /src/com/android/camera/ui | |
| parent | 026807dfd5e0b97eef54b24975937b0d038bdbb5 (diff) | |
| download | android_packages_apps_Snap-a0df98edb234a6f4702e1f01df3b67a243103fd1.tar.gz android_packages_apps_Snap-a0df98edb234a6f4702e1f01df3b67a243103fd1.tar.bz2 android_packages_apps_Snap-a0df98edb234a6f4702e1f01df3b67a243103fd1.zip | |
Snap: initial materialization
Just for initial ship
Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
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/ModuleSwitcher.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/ui/OneUICameraControls.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/ui/Switch.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index eb69aa384..30136bde5 100755 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -1100,7 +1100,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/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java index d96775d14..e9a9a5419 100644 --- a/src/com/android/camera/ui/ModuleSwitcher.java +++ b/src/com/android/camera/ui/ModuleSwitcher.java @@ -102,7 +102,7 @@ public class ModuleSwitcher extends RotateImageView private void init(Context context) { mItemSize = context.getResources().getDimensionPixelSize(R.dimen.switcher_size); - mIndicator = context.getResources().getDrawable(R.drawable.ic_switcher_menu_indicator); + mIndicator = context.getResources().getDrawable(R.color.transparent); initializeDrawables(context); } diff --git a/src/com/android/camera/ui/OneUICameraControls.java b/src/com/android/camera/ui/OneUICameraControls.java index 236a49243..1a0b7cebb 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( diff --git a/src/com/android/camera/ui/Switch.java b/src/com/android/camera/ui/Switch.java index 3e7b9bfb9..68fb36542 100644 --- a/src/com/android/camera/ui/Switch.java +++ b/src/com/android/camera/ui/Switch.java @@ -123,7 +123,7 @@ public class Switch extends CompoundButton { mSwitchMinWidth = res.getDimensionPixelSize(R.dimen.switch_min_width); mSwitchTextMaxWidth = res.getDimensionPixelSize(R.dimen.switch_text_max_width); mSwitchPadding = res.getDimensionPixelSize(R.dimen.switch_padding); - setSwitchTextAppearance(context, android.R.style.TextAppearance_Holo_Small); + setSwitchTextAppearance(context, android.R.style.TextAppearance_Material_Small); ViewConfiguration config = ViewConfiguration.get(context); mTouchSlop = config.getScaledTouchSlop(); |