Snap: Materialize

Author: jrizzoli <joey@cyanogenmoditalia.it>
Date:   Thu Jan 7 21:07:51 2016 +0100

    Snap: initial materialization

    Just for initial ship

    Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093
    Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>

Author: jrizzoli <joey@cyanogenmoditalia.it>
Date:   Mon Jan 11 21:02:08 2016 +0100

    Snap: remove captureUI pngdrawables

    CM now supports 90/270 degrees rotated vectordrawables

    Change-Id: I13b36463c60430564c00bd1e36393fff7ddbfdae
    Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>

Author: jrizzoli <joey@cyanogenmoditalia.it>
Date:   Wed Jan 20 20:54:10 2016 +0100

    Snap: update shutter button style

    Change-Id: Ide5fc0ff1c54e216ac7cd9bea202002d1d4dfa12

Author: Joey Rizzoli <joey@cyanogenmoditalia.it>
Date:   Sun Dec 11 21:30:18 2016 +0100

    Snap: update caf icons

    Change-Id: I1adaf709253637bde037b5aea1f856fc5b9029c7
    Signed-off-by: Joey Rizzoli <joey@cyanogenmoditalia.it>

Author: Arne Coucheron <arco68@gmail.com>
Date:   Thu Aug 17 01:19:05 2017 +0200

    Snap: Update HDR icons

    Current ones are so small, I can hardly see them. These new ones
    are bigger and looks more in line with the rest of the icons.

    Change-Id: Idaeec67a78d66105a375f09b6701a49dce43fd22

Author: codeworkx <daniel.hillenbrand@codeworkx.de>
Date:   Sat Jan 20 12:46:31 2018 +0100

    Snap: update shutter buttons on CaptureUI

    Change-Id: I674de05dfb46fb714979ac66c16a85825af13c95

Author: Paul Keith <javelinanddart@gmail.com>
Date:   Tue Jan 23 23:36:19 2018 +0100

    Snap: Update pano and video icons to be more like photo icons

    * Put the colored ring on the _outside_ of the shutter
    * While we're at it, cleanup naming and usage of color resources

    Change-Id: I4f344fa272374d043f2b83dba7248e263fab8bf0

Author: Andreas Blaesius <andi@unlegacy-android.org>
Date:   Fri Jun 1 17:47:00 2018 +0200

    Snap: remove unused shutter buttons

    Change-Id: Id913626bbccc6fd245ed9f46374389ca7eca3c30

Change-Id: I7596f3c887874b4913d87ecbfa5438191fc86249
Signed-off-by: Chippa-a <vusal1372@gmail.com>

4 files changed, 5 insertions, 5 deletions

diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index b85d7f1ca..7461e12be 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -1025,7 +1025,7 @@ public class CameraControls extends RotatableLayout {
         View[] views = {
             mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,
             TsMakeupManager.HAS_TS_MAKEUP ? mTsMakeupSwitcher : mHdrSwitcher,
-            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 fb7f9d6fd..994c1089d 100755
--- a/src/com/android/camera/ui/OneUICameraControls.java
+++ b/src/com/android/camera/ui/OneUICameraControls.java
@@ -230,7 +230,7 @@ public class OneUICameraControls extends RotatableLayout {
 
         mViews = new View[]{
                 mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,
-                mFlashButton, mShutter,
+                mFlashButton,
                 mPreview, mVideoShutter, mPauseButton, mCancelButton
         };
         mBottomLargeSize = getResources().getDimensionPixelSize(
@@ -497,7 +497,7 @@ public class OneUICameraControls extends RotatableLayout {
         View[] views = {
                 mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,
                 mFlashButton, mPreview, mMute,
-                mShutter, mVideoShutter, mMakeupSeekBarLowText, mMakeupSeekBarHighText,
+                mMakeupSeekBarLowText, mMakeupSeekBarHighText,
                 mPauseButton, mExitBestPhotpMode
         };
 
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();