am e677eb26: am 2a8efc19: Use public api instead of hidden member. Don\'t use internal resource.

Merge commit 'e677eb26a6ad63e492837dbb0af1945546095d68'

* commit 'e677eb26a6ad63e492837dbb0af1945546095d68':
  Use public api instead of hidden member. Don't use internal resource.

4 files changed, 6 insertions, 7 deletions

diff --git a/res/drawable-hdpi/ic_menu_play_clip.png b/res/drawable-hdpi/ic_menu_play_clip.png
new file mode 100644
index 0000000..ddde03a
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_play_clip.png
diff --git a/res/drawable-mdpi/ic_menu_play_clip.png b/res/drawable-mdpi/ic_menu_play_clip.png
new file mode 100644
index 0000000..4669947
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_play_clip.png
diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java
index 6518e62..e2d6d78 100644
--- a/src/com/android/camera/MenuHelper.java
+++ b/src/com/android/camera/MenuHelper.java
@@ -817,8 +817,7 @@ public class MenuHelper {
                     return onViewPlayClicked(onInvoke, activity);
                 }
             });
-            videoPlayItem.setIcon(
-                    com.android.internal.R.drawable.ic_menu_play_clip);
+            videoPlayItem.setIcon(R.drawable.ic_menu_play_clip);
             requiresVideoItems.add(videoPlayItem);
         }
 
diff --git a/src/com/android/camera/Switcher.java b/src/com/android/camera/Switcher.java
index 0813633..8cc6336 100644
--- a/src/com/android/camera/Switcher.java
+++ b/src/com/android/camera/Switcher.java
@@ -84,7 +84,7 @@ public class Switcher extends ImageView implements View.OnTouchListener {
     public boolean onTouchEvent(MotionEvent event) {
         if (!isEnabled()) return false;
 
-        final int available = getHeight() - mPaddingTop - mPaddingBottom
+        final int available = getHeight() - getPaddingTop() - getPaddingBottom()
                 - getDrawable().getIntrinsicHeight();
 
         switch (event.getAction()) {
@@ -121,10 +121,10 @@ public class Switcher extends ImageView implements View.OnTouchListener {
         Drawable drawable = getDrawable();
         int drawableHeight = drawable.getIntrinsicHeight();
         final int height = getHeight();
-        final int available = height - mPaddingTop - mPaddingBottom
+        final int available = height - getPaddingTop() - getPaddingBottom()
                 - drawableHeight;
         int x = (int) event.getY();
-        mPosition = x - mPaddingTop - drawableHeight / 2;
+        mPosition = x - getPaddingTop() - drawableHeight / 2;
         if (mPosition < 0) mPosition = 0;
         if (mPosition > available) mPosition = available;
         invalidate();
@@ -142,7 +142,7 @@ public class Switcher extends ImageView implements View.OnTouchListener {
         }
 
         if (mAnimationStartTime != NO_ANIMATION) {
-            final int available = getHeight() - mPaddingTop - mPaddingBottom
+            final int available = getHeight() - getPaddingTop() - getPaddingBottom()
                     - drawableHeight;
             long time = AnimationUtils.currentAnimationTimeMillis();
             int deltaTime = (int) (time - mAnimationStartTime);
@@ -158,7 +158,7 @@ public class Switcher extends ImageView implements View.OnTouchListener {
             }
         }
 
-        int offsetTop = mPaddingTop + mPosition;
+        int offsetTop = getPaddingTop() + mPosition;
         int offsetLeft = (getWidth()
                 - drawableWidth - mPaddingLeft - mPaddingRight) / 2;
         int saveCount = canvas.getSaveCount();