Pixel perfect group detail
- Remove extra GroupDetailTheme and just use the
ContactDetailActivityTheme
- Remove split style action bar on group detail page,
Fix pressed state sizes for "group source" button
- Remove intent filter on group list activity
that was added temporarily during development to
allow launching the group list without the main
PeopleActivity (when the split of the Contacts app
into People/Phone were still under construction)
https://android-git.corp.google.com/g/#/c/109558/5/AndroidManifest.xml
Bug: 4686433
Change-Id: I6f9aa0c94f520e90489ad63aaad07501156c6539
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e255fd2..9640536 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -361,28 +361,18 @@
</intent-filter>
</activity>
-
<!-- List of groups -->
<activity android:name=".activities.GroupBrowserActivity"
android:label="@string/contactsGroupsLabel"
android:theme="@style/PeopleTheme"
android:uiOptions="splitActionBarWhenNarrow"
android:launchMode="singleTop"
- android:clearTaskOnLaunch="true">
- <!-- TODO: Remove this temporary intent action name when the fragmentization
- work is done. -->
- <intent-filter>
- <action android:name="com.android.phone.action.GROUPS_LIST" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="android.intent.category.TAB" />
- </intent-filter>
- </activity>
+ android:clearTaskOnLaunch="true"/>
<!-- Views the details of a single group -->
<activity android:name=".activities.GroupDetailActivity"
android:label=""
- android:theme="@style/GroupDetailTheme"
- android:uiOptions="splitActionBarWhenNarrow"/>
+ android:theme="@style/DetailActivityTheme"/>
<!-- Create a new or edit an existing group -->
<activity
@@ -485,7 +475,7 @@
<!-- Views the details of a single contact -->
<activity android:name=".activities.ContactDetailActivity"
android:label="@string/viewContactTitle"
- android:theme="@style/ContactDetailActivityTheme">
+ android:theme="@style/DetailActivityTheme">
<intent-filter android:label="@string/viewContactDesription">
<action android:name="android.intent.action.VIEW" />
diff --git a/res/layout-sw580dp-w1000dp/group_detail_fragment.xml b/res/layout-sw580dp-w1000dp/group_detail_fragment.xml
index 4f2fb9e..45419a8 100644
--- a/res/layout-sw580dp-w1000dp/group_detail_fragment.xml
+++ b/res/layout-sw580dp-w1000dp/group_detail_fragment.xml
@@ -27,8 +27,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="12dip"
- android:paddingBottom="12dip"
android:orientation="horizontal" >
<LinearLayout
@@ -42,6 +40,7 @@
android:id="@+id/group_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingTop="12dip"
android:paddingLeft="8dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold" />
@@ -50,6 +49,7 @@
android:id="@+id/group_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingBottom="12dip"
android:paddingLeft="8dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary" />
@@ -60,7 +60,6 @@
android:id="@+id/group_source_view_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_gravity="center_vertical"
android:paddingRight="@dimen/group_detail_border_padding" />
</LinearLayout>
diff --git a/res/layout-sw580dp/group_detail_fragment.xml b/res/layout-sw580dp/group_detail_fragment.xml
index 99a60f3..90ca03a 100644
--- a/res/layout-sw580dp/group_detail_fragment.xml
+++ b/res/layout-sw580dp/group_detail_fragment.xml
@@ -50,7 +50,7 @@
<FrameLayout
android:id="@+id/group_source_view_container"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
diff --git a/res/layout-sw580dp/group_source_button.xml b/res/layout-sw580dp/group_source_button.xml
index 6b0b8fe..a058990 100644
--- a/res/layout-sw580dp/group_source_button.xml
+++ b/res/layout-sw580dp/group_source_button.xml
@@ -24,6 +24,7 @@
android:id="@+id/group_source"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:padding="10dip" >
diff --git a/res/layout-w470dp/group_source_button.xml b/res/layout-w470dp/group_source_button.xml
index 4e8838e..fb57e83 100644
--- a/res/layout-w470dp/group_source_button.xml
+++ b/res/layout-w470dp/group_source_button.xml
@@ -27,10 +27,10 @@
android:divider="?android:attr/dividerVertical"
android:showDividers="end"
android:dividerPadding="12dip"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ style="?android:attr/actionButtonStyle">
<LinearLayout
- style="?android:attr/actionButtonStyle"
android:id="@+id/group_source"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@@ -52,7 +52,7 @@
android:layout_height="25dip"
android:layout_marginLeft="7dip"
android:layout_marginRight="7dip"
- android:layout_centerVertical="true"/>
+ android:layout_gravity="center_vertical"/>
</LinearLayout>
diff --git a/res/layout/group_detail_fragment.xml b/res/layout/group_detail_fragment.xml
index c29355e..34eb285 100644
--- a/res/layout/group_detail_fragment.xml
+++ b/res/layout/group_detail_fragment.xml
@@ -22,7 +22,7 @@
<FrameLayout
android:id="@+id/group_source_view_container"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
diff --git a/res/values-sw580dp-w1000dp/dimens.xml b/res/values-sw580dp-w1000dp/dimens.xml
index d5f5e58..34c89fc 100644
--- a/res/values-sw580dp-w1000dp/dimens.xml
+++ b/res/values-sw580dp-w1000dp/dimens.xml
@@ -18,6 +18,7 @@
<dimen name="action_bar_filter_max_width">300dip</dimen>
<dimen name="action_bar_search_max_width">336dip</dimen>
<dimen name="action_bar_search_spacing">32dip</dimen>
+ <dimen name="group_detail_border_padding">32dip</dimen>
<dimen name="detail_header_view_margin">16dip</dimen>
<dimen name="detail_header_attribution_height">56dip</dimen>
<dimen name="detail_update_section_top_padding">48dip</dimen>
diff --git a/res/values-sw580dp/dimens.xml b/res/values-sw580dp/dimens.xml
index 440929a..c75ba6e 100644
--- a/res/values-sw580dp/dimens.xml
+++ b/res/values-sw580dp/dimens.xml
@@ -31,6 +31,7 @@
<dimen name="action_bar_search_spacing">12dip</dimen>
<dimen name="shortcut_icon_size">64dip</dimen>
<dimen name="list_section_height">37dip</dimen>
+ <dimen name="group_detail_border_padding">16dip</dimen>
<dimen name="detail_update_section_side_padding">0dip</dimen>
<dimen name="detail_update_section_item_horizontal_padding">8dip</dimen>
<dimen name="detail_update_section_item_vertical_padding">32dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 03a9134..f218bd2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -77,7 +77,7 @@
<item name="call_log_voicemail_status_text_color">#000000</item>
</style>
- <style name="ContactDetailActivityTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
+ <style name="DetailActivityTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
<item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>
<item name="android:textColorPrimary">@color/primary_text_color</item>
@@ -175,37 +175,6 @@
<item name="android:background">@drawable/action_bar_tab</item>
</style>
- <!-- TODO: Clean up this file so themes aren't copied. -->
- <style name="GroupDetailTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
- <item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
- <item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>
- <item name="android:textColorPrimary">@color/primary_text_color</item>
- <item name="android:textColorSecondary">@color/secondary_text_color</item>
- <item name="list_item_height">?android:attr/listPreferredItemHeight</item>
- <item name="activated_background">@drawable/list_item_activated_background</item>
- <item name="section_header_background">@drawable/list_title_holo</item>
- <item name="list_section_header_height">32dip</item>
- <item name="list_item_divider">?android:attr/listDivider</item>
- <item name="list_item_padding_top">4dip</item>
- <item name="list_item_padding_right">11dip</item>
- <item name="list_item_padding_bottom">4dip</item>
- <item name="list_item_padding_left">4dip</item>
- <item name="list_item_gap_between_image_and_text">8dip</item>
- <item name="list_item_gap_between_label_and_data">5dip</item>
- <item name="list_item_call_button_padding">14dip</item>
- <item name="list_item_vertical_divider_margin">5dip</item>
- <item name="list_item_presence_icon_margin">5dip</item>
- <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
- <item name="list_item_profile_photo_size">70dip</item>
- <item name="list_item_prefix_highlight_color">#729a27</item>
- <item name="list_item_header_text_color">?color/section_header_text_color</item>
- <item name="list_item_header_text_size">14sp</item>
- <item name="list_item_header_text_indent">8dip</item>
- <item name="contact_browser_list_padding_left">16dip</item>
- <item name="contact_browser_list_padding_right">0dip</item>
- <item name="contact_browser_background">@android:color/transparent</item>
- </style>
-
<style name="ContactPickerTheme" parent="@style/PeopleTheme">
</style>
<style name="ContactPickerLayout" parent="ContactPickerTheme">