3 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index dd769e8e3..9695326c4 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -489,7 +489,7 @@ public class CameraControls extends RotatableLayout {
                 mPreview.animate().translationXBy(-mSize).setDuration(ANIME_DURATION);
                 break;
         }
-        mRemainingPhotos.setVisibility(View.INVISIBLE);
+        //mRemainingPhotos.setVisibility(View.INVISIBLE);
         mRefocusToast.setVisibility(View.GONE);
     }
 
@@ -579,9 +579,9 @@ public class CameraControls extends RotatableLayout {
                 mPreview.animate().translationXBy(mSize).setDuration(ANIME_DURATION);
                 break;
         }
-        if (mRemainingPhotos.getVisibility() == View.INVISIBLE) {
+        /*if (mRemainingPhotos.getVisibility() == View.INVISIBLE) {
             mRemainingPhotos.setVisibility(View.VISIBLE);
-        }
+        }*/
         mRefocusToast.setVisibility(View.GONE);
     }
 
@@ -829,7 +829,7 @@ public class CameraControls extends RotatableLayout {
         mOrientation = orientation;
         View[] views = {
             mSceneModeSwitcher, mFilterModeSwitcher, mFrontBackSwitcher,
-            mHdrSwitcher, mMenu, mShutter, mPreview, mSwitcher
+            mHdrSwitcher, mMenu, mPreview, mSwitcher
         };
         for (View v : views) {
             ((RotateImageView) v).setOrientation(orientation, animation);
diff --git a/src/com/android/camera/ui/ModuleSwitcher.java b/src/com/android/camera/ui/ModuleSwitcher.java
index 217c92a54..efac6d98b 100644
--- a/src/com/android/camera/ui/ModuleSwitcher.java
+++ b/src/com/android/camera/ui/ModuleSwitcher.java
@@ -98,7 +98,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/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();