Fix various Quick Contact visuals
Also fixed a bug where the secondary action can be tapped even though
it doesn't exist (crashes)
This also fixes pushed states, which have been filed a couple of times
Bug:5137515
Change-Id: I810d12a79f0088a0770a0eaf9225fe7906ebd8e7
diff --git a/res/drawable/quickcontact_list_item_background.xml b/res/drawable/quickcontact_list_item_background.xml
index e6d773e..afb3947 100644
--- a/res/drawable/quickcontact_list_item_background.xml
+++ b/res/drawable/quickcontact_list_item_background.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
-<!-- TODO These all have to be refined -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_window_focused="false"
@@ -31,5 +30,5 @@
android:state_focused="true"
android:drawable="@drawable/list_focused_holo" />
<item
- android:drawable="@color/people_app_theme_color" />
+ android:drawable="@color/quickcontact_list_background" />
</selector>
diff --git a/res/layout-sw580dp/quickcontact_activity.xml b/res/layout-sw580dp/quickcontact_activity.xml
index 21b5ad2..8c8bfae 100644
--- a/res/layout-sw580dp/quickcontact_activity.xml
+++ b/res/layout-sw580dp/quickcontact_activity.xml
@@ -32,12 +32,12 @@
android:layout_height="200dip">
<include layout="@layout/quickcontact_photo_container" />
</FrameLayout>
+ <include layout="@layout/quickcontact_track" />
<View
- android:id="@+id/line_before_track"
+ android:id="@+id/line_after_track"
android:layout_width="match_parent"
android:layout_height="2dip"
- android:background="@color/quickcontact_list_background" />
- <include layout="@layout/quickcontact_track" />
+ android:background="@color/quickcontact_tab_indicator" />
<android.support.v4.view.ViewPager
android:id="@+id/item_list_pager"
android:layout_width="match_parent"
diff --git a/res/layout-w470dp/quickcontact_activity.xml b/res/layout-w470dp/quickcontact_activity.xml
index 36d499d..dbd5260 100644
--- a/res/layout-w470dp/quickcontact_activity.xml
+++ b/res/layout-w470dp/quickcontact_activity.xml
@@ -42,6 +42,11 @@
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/quickcontact_track" />
+ <View
+ android:id="@+id/line_after_track"
+ android:layout_width="match_parent"
+ android:layout_height="2dip"
+ android:background="@color/quickcontact_tab_indicator" />
<android.support.v4.view.ViewPager
android:id="@+id/item_list_pager"
android:background="@color/quickcontact_list_background"
diff --git a/res/layout/quickcontact_activity.xml b/res/layout/quickcontact_activity.xml
index 2f5a357..c8d0ad4 100644
--- a/res/layout/quickcontact_activity.xml
+++ b/res/layout/quickcontact_activity.xml
@@ -38,12 +38,12 @@
ex:direction="widthToHeight">
<include layout="@layout/quickcontact_photo_container" />
</view>
+ <include layout="@layout/quickcontact_track" />
<View
- android:id="@+id/line_before_track"
+ android:id="@+id/line_after_track"
android:layout_width="match_parent"
android:layout_height="2dip"
- android:background="@color/quickcontact_list_background" />
- <include layout="@layout/quickcontact_track" />
+ android:background="@color/quickcontact_tab_indicator" />
<android.support.v4.view.ViewPager
android:id="@+id/item_list_pager"
android:layout_width="match_parent"
diff --git a/res/layout/quickcontact_list_item.xml b/res/layout/quickcontact_list_item.xml
index 4ffa091..7929718 100755
--- a/res/layout/quickcontact_list_item.xml
+++ b/res/layout/quickcontact_list_item.xml
@@ -36,28 +36,30 @@
android:id="@android:id/text1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@android:color/white"
+ android:textColor="@color/primary_text_color"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@android:id/text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@android:color/white"
+ android:textColor="@color/primary_text_color"
android:textAllCaps="true"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<View
android:id="@+id/vertical_divider"
android:layout_width="1dip"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_gravity="center_vertical"
- android:background="@drawable/ic_divider_dashed_holo_dark" />
+ android:layout_marginTop="@dimen/detail_vertical_divider_vertical_margin"
+ android:layout_marginBottom="@dimen/detail_vertical_divider_vertical_margin"
+ android:background="?android:attr/dividerVertical" />
<ImageView
android:id="@+id/secondary_action_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="@dimen/detail_item_icon_margin"
android:paddingRight="@dimen/detail_item_icon_margin"
- android:background="@drawable/quickcontact_list_item_background"
+ android:background="?android:attr/selectableItemBackground"
android:duplicateParentState="false" />
</LinearLayout>
diff --git a/res/layout/quickcontact_track.xml b/res/layout/quickcontact_track.xml
index 8177174..bf25cb3 100644
--- a/res/layout/quickcontact_track.xml
+++ b/res/layout/quickcontact_track.xml
@@ -33,10 +33,10 @@
<View
android:id="@+id/selected_tab_rectangle"
android:layout_width="60dip"
- android:layout_height="8dip"
+ android:layout_height="6dip"
android:layout_alignBottom="@id/track"
android:layout_alignParentLeft="true"
- android:background="@color/quickcontact_list_background" />
+ android:background="@color/quickcontact_tab_indicator" />
</RelativeLayout>
</HorizontalScrollView>
</merge>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 64d7dfb..0b8f1b7 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,8 +17,9 @@
<color name="textColorIconOverlay">#fff</color>
<color name="textColorIconOverlayShadow">#000</color>
- <color name="quickcontact_list_divider">#ff48bde8</color>
- <color name="quickcontact_list_background">#ff33b5e6</color>
+ <color name="quickcontact_list_divider">#ffcdcdcd</color>
+ <color name="quickcontact_list_background">#ffe2e2e2</color>
+ <color name="quickcontact_tab_indicator">#ff33b5e6</color>
<color name="edit_divider">#ff666666</color>