Merge "Updating People activity avatar." into ub-contactsdialer-f-dev
diff --git a/res-common/drawable/ic_material_star.xml b/res-common/drawable/ic_material_star.xml
new file mode 100644
index 0000000..cd7c61c
--- /dev/null
+++ b/res-common/drawable/ic_material_star.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- Material design star icon -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+<path
+ android:fillColor="#000000"
+ android:pathData="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/>
+</vector>
\ No newline at end of file
diff --git a/res-common/drawable/ic_person_add_tinted_24dp.xml b/res-common/drawable/ic_person_add_tinted_24dp.xml
index 00005f0..fdbf4fa 100644
--- a/res-common/drawable/ic_person_add_tinted_24dp.xml
+++ b/res-common/drawable/ic_person_add_tinted_24dp.xml
@@ -16,5 +16,4 @@
-->
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/ic_person_add_24dp"
- android:autoMirrored="true"
- android:tint="@color/actionbar_icon_color_grey" />
+ android:autoMirrored="true"/>
diff --git a/res-common/layout/contact_list_filter.xml b/res-common/layout/contact_list_filter.xml
index d419c7e..34c713c 100644
--- a/res-common/layout/contact_list_filter.xml
+++ b/res-common/layout/contact_list_filter.xml
@@ -26,18 +26,10 @@
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="0dip"
- android:layout_weight="1"
- android:layout_marginLeft="@dimen/contact_filter_left_margin"
- android:layout_marginRight="@dimen/contact_filter_right_margin"
- android:layout_marginStart="@dimen/contact_filter_left_margin"
- android:layout_marginEnd="@dimen/contact_filter_right_margin" />
+ android:layout_weight="1" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_marginStart="16dip"
- android:layout_marginEnd="16dip"
android:background="?android:attr/dividerHorizontal" />
</LinearLayout>
diff --git a/res-common/layout/contact_list_filter_item.xml b/res-common/layout/contact_list_filter_item.xml
index 9f4fa47..9f297e6 100644
--- a/res-common/layout/contact_list_filter_item.xml
+++ b/res-common/layout/contact_list_filter_item.xml
@@ -20,6 +20,8 @@
android:descendantFocusability="blocksDescendants"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingStart="@dimen/contact_filter_left_margin"
+ android:paddingEnd="@dimen/contact_filter_right_margin"
android:minHeight="@dimen/contact_filter_item_min_height"
android:gravity="center_vertical">
@@ -33,6 +35,7 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:layout_marginTop="-1dip"
android:orientation="vertical"
android:layout_marginLeft="8dip"
android:layout_marginStart="8dip">
@@ -41,7 +44,7 @@
android:id="@+id/accountType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="@color/account_filter_text_color"
android:singleLine="true"
android:ellipsize="end"/>
@@ -51,7 +54,7 @@
android:layout_marginTop="-3dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="@color/account_filter_text_color"
android:singleLine="true"
android:ellipsize="end"/>
@@ -60,7 +63,6 @@
<RadioButton
android:id="@+id/radioButton"
android:clickable="false"
- android:layout_marginTop="1dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical" />
diff --git a/res-common/layout/custom_contact_list_filter_account.xml b/res-common/layout/custom_contact_list_filter_account.xml
index 7fd9fba..c7a6cb5 100644
--- a/res-common/layout/custom_contact_list_filter_account.xml
+++ b/res-common/layout/custom_contact_list_filter_account.xml
@@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textAppearance="?android:attr/textAppearanceListItem"
android:duplicateParentState="true" />
<TextView
@@ -51,7 +51,7 @@
android:layout_alignLeft="@android:id/text1"
android:layout_alignStart="@android:id/text1"
android:maxLines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="?android:attr/textColorTertiary"
android:duplicateParentState="true" />
diff --git a/res-common/layout/custom_contact_list_filter_group.xml b/res-common/layout/custom_contact_list_filter_group.xml
index 1c68387..c67ce16 100644
--- a/res-common/layout/custom_contact_list_filter_group.xml
+++ b/res-common/layout/custom_contact_list_filter_group.xml
@@ -48,8 +48,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="marquee"
- android:textSize="@dimen/contact_browser_list_item_text_size"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textAppearance="?android:attr/textAppearanceListItem"
android:textColor="@color/account_filter_text_color"
android:duplicateParentState="true"
/>
@@ -62,7 +61,7 @@
android:layout_alignLeft="@android:id/text1"
android:layout_alignStart="@android:id/text1"
android:maxLines="2"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:textColor="@color/account_filter_text_color"
android:duplicateParentState="true"
/>
@@ -73,8 +72,6 @@
android:id="@android:id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="4dip"
- android:layout_marginEnd="4dip"
android:focusable="false"
android:clickable="false"
android:gravity="center_vertical"
diff --git a/res-common/layout/search_bar_expanded.xml b/res-common/layout/search_bar_expanded.xml
index a599e4c..ecadbd1 100644
--- a/res-common/layout/search_bar_expanded.xml
+++ b/res-common/layout/search_bar_expanded.xml
@@ -26,7 +26,7 @@
android:id="@+id/search_back_button"
android:layout_width="@dimen/search_box_icon_size"
android:layout_height="@dimen/search_box_icon_size"
- android:layout_margin="@dimen/search_box_navigation_icon_margin"
+ android:layout_marginEnd="@dimen/search_box_navigation_icon_margin"
android:src="@drawable/ic_back_arrow"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_menu_back_from_search"
diff --git a/res-common/values-sw600dp/dimens.xml b/res-common/values-sw600dp/dimens.xml
index d438e6b..4e812fd 100644
--- a/res-common/values-sw600dp/dimens.xml
+++ b/res-common/values-sw600dp/dimens.xml
@@ -23,6 +23,7 @@
<dimen name="contact_browser_list_header_text_margin">18dp</dimen>
<dimen name="contact_filter_list_item_padding_start">24dp</dimen>
+ <dimen name="contact_filter_left_margin">16dp</dimen>
<!-- Right margin of the floating action button -->
<dimen name="floating_action_button_margin_right">32dp</dimen>
diff --git a/res-common/values/colors.xml b/res-common/values/colors.xml
index b555bff..7840058 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -183,4 +183,6 @@
<!-- Color of account/custom filters -->
<color name="account_filter_text_color">@color/actionbar_text_color_black</color>
<color name="custom_filter_divider">#dbdbdb</color>
+
+ <color name="material_star_pink">#f50057</color>
</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 8acd801..acfb67d 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -41,15 +41,15 @@
<dimen name="contact_tile_shadowbox_height">48sp</dimen>
<!-- For contact filter setting screens -->
- <dimen name="contact_filter_left_margin">16dip</dimen>
+ <dimen name="contact_filter_left_margin">8dp</dimen>
<dimen name="contact_filter_right_margin">16dip</dimen>
<dimen name="contact_filter_item_min_height">48dip</dimen>
<dimen name="contact_filter_icon_size">32dip</dimen>
<dimen name="contact_filter_list_item_height">56dp</dimen>
<dimen name="contact_filter_list_item_padding_start">16dp</dimen>
<!-- contact_filter_indicator is the arrow in expandable list view -->
- <dimen name="contact_filter_indicator_padding_start">10dp</dimen>
- <dimen name="contact_filter_indicator_padding_end">50dp</dimen>
+ <dimen name="contact_filter_indicator_padding_start">6dp</dimen>
+ <dimen name="contact_filter_indicator_padding_end">46dp</dimen>
<dimen name="contact_filter_action_button_width">72dp</dimen>
<!-- Padding to be used between a visible scrollbar and the contact list -->
@@ -85,7 +85,7 @@
<dimen name="contact_browser_list_item_text_size">16sp</dimen>
<dimen name="contact_browser_list_item_photo_size">40dp</dimen>
<dimen name="contact_browser_list_item_gap_between_image_and_text">15dp</dimen>
- <dimen name="contact_browser_list_item_gap_between_indexer_and_image">6dp</dimen>
+ <dimen name="contact_browser_list_item_gap_between_indexer_and_image">20dp</dimen>
<dimen name="contact_browser_list_top_margin">12dp</dimen>
<!-- Dimensions for "No contacts" string in PhoneFavoriteFragment for the All contacts
@@ -133,13 +133,13 @@
<!-- Padding around the icon in the search box. -->
<dimen name="search_box_icon_margin">4dp</dimen>
<!-- Size of the icon (voice search, back arrow) in the search box. -->
- <dimen name="search_box_icon_size">48dp</dimen>
+ <dimen name="search_box_icon_size">56dp</dimen>
<!-- Size of the close icon.-->
<dimen name="search_box_close_icon_size">56dp</dimen>
<!-- Padding around the close button. It's visible size without padding is 24dp. -->
<dimen name="search_box_close_icon_padding">16dp</dimen>
- <!-- Padding around back arrow icon in the search box -->
- <dimen name="search_box_navigation_icon_margin">14dp</dimen>
+ <!-- End margin of the back arrow icon in the search box -->
+ <dimen name="search_box_navigation_icon_margin">8dp</dimen>
<!-- Left margin of the text field in the search box. -->
<dimen name="search_box_text_left_margin">8dp</dimen>
<!-- Search box text size -->
@@ -147,6 +147,9 @@
<item name="close_icon_alpha" format="float" type="dimen">0.54</item>
+ <!-- Size of the close icon in selection bar.-->
+ <dimen name="selection_bar_close_icon_size">56dp</dimen>
+
<!-- Top margin for the Frequently Contacted section title -->
<dimen name="frequently_contacted_title_top_margin_when_first_row">16dp</dimen>
<!-- Top margin for the Frequently Contacted section title, when the title is the first
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 168816a..ead4221 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -21,7 +21,7 @@
</style>
<style name="SectionHeaderStyle" parent="@android:style/TextAppearance.Large">
- <item name="android:textSize">18sp</item>
+ <item name="android:textSize">16sp</item>
<item name="android:textAllCaps">true</item>
<item name="android:textColor">@color/section_header_text_color</item>
<item name="android:textStyle">bold</item>