commit e078e325fb49e93b4e896a7e84dd3d28da1a489e
author Chiao Cheng <chiaocheng@google.com> Wed Nov 14 17:23:31 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 14 17:23:31 2012 -0800
tree ac8bd25129b3a780a090d70fd17c89080bc4ae35
parent 67e318b4d6db91c6e3edfc1adaa7584653be9c8f
parent 3603b6cf6e09d211a9c52cd1a56f4f028ca873ca

am 3603b6cf: Merge "Fix incorrect tab highlight in QuickContactActivity." into jb-mr1.1-dev

* commit '3603b6cf6e09d211a9c52cd1a56f4f028ca873ca':
  Fix incorrect tab highlight in QuickContactActivity.

res/layout-sw580dp/quickcontact_activity.xml

diff --git a/res/layout-sw580dp/quickcontact_activity.xml b/res/layout-sw580dp/quickcontact_activity.xml
index a97d86c..129a6e5 100644
--- a/res/layout-sw580dp/quickcontact_activity.xml
+++ b/res/layout-sw580dp/quickcontact_activity.xml
@@ -42,6 +42,7 @@
             android:background="@color/quickcontact_tab_indicator" />
         <android.support.v4.view.ViewPager
             android:id="@+id/item_list_pager"
+            android:background="@color/quickcontact_list_background"
             android:layout_width="match_parent"
             android:layout_height="160dip" />
     </LinearLayout>

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 16814dc..37417c2 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -587,13 +587,18 @@
             final CheckableImageView actionView = getActionViewAt(position);
             mTrackScroller.requestChildRectangleOnScreen(actionView,
                     new Rect(0, 0, actionView.getWidth(), actionView.getHeight()), false);
+            renderSelectedRectangle(position, 0);
         }
 
         @Override
         public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            renderSelectedRectangle(position, positionOffset);
+        }
+
+        private void renderSelectedRectangle(int position, float positionOffset) {
             final RelativeLayout.LayoutParams layoutParams =
                     (RelativeLayout.LayoutParams) mSelectedTabRectangle.getLayoutParams();
-            final int width = mSelectedTabRectangle.getWidth();
+            final int width = layoutParams.width;
             layoutParams.leftMargin = (int) ((position + positionOffset) * width);
             mSelectedTabRectangle.setLayoutParams(layoutParams);
         }