Merge "Adjusting colors and fonts in contact status bubble" into honeycomb
diff --git a/res/layout-xlarge-land/contact_detail_list_item.xml b/res/layout-xlarge-land/contact_detail_list_item.xml
index 394d6c0..529059a 100644
--- a/res/layout-xlarge-land/contact_detail_list_item.xml
+++ b/res/layout-xlarge-land/contact_detail_list_item.xml
@@ -17,33 +17,33 @@
*/
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
->
+ android:orientation="vertical">
+
<!-- Longer separating line (between kinds) -->
<View
android:id="@+id/kind_divider"
android:layout_width="match_parent"
android:layout_height="1px"
- android:background="@drawable/list_item_divider_holo"
- />
+ android:background="@drawable/list_item_divider_holo" />
+
<!-- Shorter separating line if there was no kind-separator -->
<View
android:id="@+id/in_kind_divider"
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginLeft="164dip"
- android:background="@drawable/list_item_divider_holo"
- />
+ android:background="@drawable/list_item_divider_holo" />
+
<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"
- android:minHeight="?android:attr/listPreferredItemHeight">
+ android:minHeight="@dimen/detail_min_line_item_height">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -52,14 +52,13 @@
<TextView
android:id="@+id/kind"
android:layout_width="164dip"
- android:layout_height="?android:attr/listPreferredItemHeight"
+ android:layout_height="@dimen/detail_min_line_item_height"
android:paddingLeft="19dip"
- android:textColor="#7F7F7F"
android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorTertiary"
android:singleLine="true"
android:ellipsize="marquee"
- android:gravity="center_vertical"
- />
+ android:gravity="center_vertical" />
<LinearLayout
android:layout_width="wrap_content"
@@ -72,44 +71,38 @@
android:id="@+id/data"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceLarge"
- />
+ android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/footer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:visibility="gone"
- />
+ android:visibility="gone" />
</LinearLayout>
<TextView
android:id="@+id/type"
android:layout_width="wrap_content"
- android:layout_height="?android:attr/listPreferredItemHeight"
+ android:layout_height="@dimen/detail_min_line_item_height"
android:maxWidth="150dip"
- android:textColor="#999999"
android:gravity="right|center_vertical"
- android:textAppearance="?android:attr/textAppearanceSmall"
- />
+ android:textColor="@color/detail_item_type_color"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
<ImageView
android:id="@+id/presence_icon"
- android:layout_width="wrap_content"
- android:layout_height="?android:attr/listPreferredItemHeight"
+ android:layout_width="32dip"
+ android:layout_height="@dimen/detail_min_line_item_height"
android:layout_marginLeft="5dip"
android:gravity="center"
- android:scaleType="centerInside"
- />
+ android:scaleType="centerInside" />
<ImageView
android:id="@+id/action_icon"
- android:layout_width="30dip"
- android:layout_height="?android:attr/listPreferredItemHeight"
- android:layout_marginLeft="14dip"
- android:layout_marginRight="14dip"
+ android:layout_width="32dip"
+ android:layout_height="@dimen/detail_min_line_item_height"
+ android:layout_marginLeft="16dip"
android:layout_gravity="center_vertical"
- android:scaleType="centerInside"
- />
+ android:scaleType="centerInside" />
<View
android:id="@+id/divider"
@@ -117,27 +110,25 @@
android:layout_height="match_parent"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
- android:background="@drawable/divider_vertical_dark"
- />
+ android:layout_marginLeft="14dip"
+ android:layout_marginRight="14dip"
+ android:background="?android:attr/dividerVertical" />
<ImageView
android:id="@+id/secondary_action_button"
- android:layout_width="58dip"
+ android:layout_width="32dip"
android:layout_height="match_parent"
android:layout_centerVertical="true"
- android:paddingLeft="14dip"
- android:paddingRight="14dip"
android:gravity="center"
android:scaleType="center"
- android:background="@android:drawable/list_selector_background"
- />
+ android:background="?android:attr/selectableItemBackground" />
</LinearLayout>
</LinearLayout>
+
<!-- Longer separating line (only for the last row) -->
<View
android:id="@+id/line_below_last"
android:layout_width="match_parent"
android:layout_height="1px"
- android:background="@drawable/list_item_divider_holo"
- />
+ android:background="@drawable/list_item_divider_holo" />
</LinearLayout>
diff --git a/res/layout-xlarge/contact_browser.xml b/res/layout-xlarge/contact_browser.xml
index d7ab617..6f39373 100644
--- a/res/layout-xlarge/contact_browser.xml
+++ b/res/layout-xlarge/contact_browser.xml
@@ -41,8 +41,8 @@
<View
android:layout_width="match_parent"
android:layout_height="2dip"
- android:layout_marginLeft="56dip"
- android:layout_marginTop="40dip"
+ android:layout_marginLeft="40dip"
+ android:layout_marginTop="24dip"
android:background="#7e7e87" />
<fragment
diff --git a/res/layout-xlarge/contact_detail_fragment.xml b/res/layout-xlarge/contact_detail_fragment.xml
index 4c1759d..60d3cd5 100644
--- a/res/layout-xlarge/contact_detail_fragment.xml
+++ b/res/layout-xlarge/contact_detail_fragment.xml
@@ -38,7 +38,7 @@
ex:layout_wideMarginRight="48dip"
ex:layout_narrowParentWidth="500dip"
ex:layout_narrowMarginLeft="15dip"
- ex:layout_narrowMarginRight="5dip"
+ ex:layout_narrowMarginRight="16dip"
/>
</com.android.contacts.widget.InterpolatingLayout>
@@ -76,7 +76,7 @@
ex:layout_widePaddingRight="48dip"
ex:layout_narrowParentWidth="500dip"
ex:layout_narrowMarginLeft="32dip"
- ex:layout_narrowPaddingRight="0dip"
+ ex:layout_narrowPaddingRight="16dip"
android:cacheColorHint="#00000000"
android:divider="@android:color/transparent"
/>
diff --git a/res/layout-xlarge/contacts_list_content.xml b/res/layout-xlarge/contacts_list_content.xml
deleted file mode 100644
index 17f35d2..0000000
--- a/res/layout-xlarge/contacts_list_content.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/pinned_header_list_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- >
-
- <view
- class="com.android.contacts.list.ContactEntryListView"
- android:id="@android:id/list"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:fastScrollEnabled="true"
- android:layout_weight="1"
- />
-
- <ViewStub android:id="@+id/footer_stub"
- android:layout="@layout/footer_panel"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- />
-
-</LinearLayout>
diff --git a/res/layout-xlarge/raw_contact_editor_header.xml b/res/layout-xlarge/raw_contact_editor_header.xml
index 114bb5d..a973464 100644
--- a/res/layout-xlarge/raw_contact_editor_header.xml
+++ b/res/layout-xlarge/raw_contact_editor_header.xml
@@ -20,7 +20,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="64dip"
android:layout_width="match_parent"
- android:background="@android:drawable/list_selector_background">
+ android:background="?android:attr/selectableItemBackground">
<ImageView
android:id="@+id/header_icon"
diff --git a/res/layout/add_contact_menu_item.xml b/res/layout/add_contact_menu_item.xml
index 380bc53..1bdbcac 100644
--- a/res/layout/add_contact_menu_item.xml
+++ b/res/layout/add_contact_menu_item.xml
@@ -19,8 +19,8 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:divider="?android:attr/dividerVertical"
- android:showDividers="beginning|end"
- android:dividerPadding="8dip"
+ android:showDividers="end"
+ android:dividerPadding="12dip"
android:orientation="horizontal">
<LinearLayout
diff --git a/res/layout/contact_detail_list_item.xml b/res/layout/contact_detail_list_item.xml
index 3b249b3..13b07bb 100644
--- a/res/layout/contact_detail_list_item.xml
+++ b/res/layout/contact_detail_list_item.xml
@@ -17,54 +17,51 @@
*/
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
->
+ android:orientation="vertical">
+
<!-- Seperator that shows the kind -->
- <LinearLayout android:id="@+id/kind_divider"
+ <LinearLayout
+ android:id="@+id/kind_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- >
+ android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="1px"
- android:background="@drawable/list_item_divider_holo"
- />
+ android:background="@drawable/list_item_divider_holo" />
<TextView
android:id="@+id/kind"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="31dip"
android:paddingLeft="16dip"
- android:background="#ffff"
- android:textColor="#7F7F7F"
- />
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorTertiary" />
<ImageView
android:layout_width="match_parent"
android:layout_height="1px"
- android:background="@drawable/list_item_divider_holo"
- />
+ android:background="@drawable/list_item_divider_holo" />
</LinearLayout>
-
+
<!-- Shorter seperating line if there was no kind-seperator -->
<ImageView
android:id="@+id/in_kind_divider"
android:layout_marginLeft="31dip"
android:layout_width="match_parent"
android:layout_height="1px"
- android:background="@drawable/list_item_divider_holo"
- />
+ android:background="@drawable/list_item_divider_holo" />
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
+ android:minHeight="@dimen/detail_min_line_item_height"
android:orientation="horizontal"
android:paddingLeft="31dip"
- android:gravity="center_vertical"
- >
+ android:gravity="center_vertical">
<LinearLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
@@ -73,22 +70,21 @@
android:orientation="vertical"
android:paddingTop="5dip"
android:paddingBottom="7dip"
- android:gravity="center_vertical"
- >
+ android:gravity="center_vertical">
- <TextView android:id="@+id/data"
+ <TextView
+ android:id="@+id/data"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:textAppearance="?android:attr/textAppearanceLarge"
- />
+ android:textAppearance="?android:attr/textAppearanceMedium" />
- <TextView android:id="@+id/type"
+ <TextView
+ android:id="@+id/type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="#7F7F7F"
- />
+ android:textColor="@color/detail_item_type_color" />
<TextView
android:id="@+id/footer"
@@ -100,40 +96,39 @@
</LinearLayout>
- <ImageView android:id="@+id/presence_icon"
- android:layout_width="wrap_content"
+ <ImageView
+ android:id="@+id/presence_icon"
+ android:layout_width="32dip"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:gravity="center"
- android:scaleType="centerInside"
- />
+ android:scaleType="centerInside" />
- <ImageView android:id="@+id/action_icon"
- android:layout_width="30dip"
- android:layout_height="30dip"
- android:layout_marginLeft="14dip"
- android:layout_marginRight="14dip"
+ <ImageView
+ android:id="@+id/action_icon"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
+ android:layout_marginLeft="16dip"
android:gravity="center"
- android:scaleType="centerInside"
- />
+ android:scaleType="centerInside" />
- <View android:id="@+id/divider"
+ <View
+ android:id="@+id/divider"
android:layout_width="1px"
android:layout_height="match_parent"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
- android:background="@drawable/divider_vertical_dark"
- />
+ android:layout_marginLeft="14dip"
+ android:layout_marginRight="14dip"
+ android:background="?android:attr/dividerVertical" />
- <ImageView android:id="@+id/secondary_action_button"
- android:layout_width="58dip"
+ <ImageView
+ android:id="@+id/secondary_action_button"
+ android:layout_width="32dip"
android:layout_height="match_parent"
android:layout_centerVertical="true"
- android:paddingLeft="14dip"
- android:paddingRight="14dip"
android:gravity="center"
android:scaleType="center"
- android:background="@android:drawable/list_selector_background"
- />
+ android:background="?android:attr/selectableItemBackground" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/external_raw_contact_editor_view.xml b/res/layout/external_raw_contact_editor_view.xml
index 4a29735..a964ce4 100644
--- a/res/layout/external_raw_contact_editor_view.xml
+++ b/res/layout/external_raw_contact_editor_view.xml
@@ -133,7 +133,7 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
- android:drawableLeft="@android:drawable/ic_dialog_alert"
+ android:drawableLeft="?android:attr/alertDialogIcon"
android:drawablePadding="10dip"
/>
diff --git a/res/layout/navigation_bar.xml b/res/layout/navigation_bar.xml
index 62e2632..7840430 100644
--- a/res/layout/navigation_bar.xml
+++ b/res/layout/navigation_bar.xml
@@ -17,7 +17,6 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="?android:attr/actionBarTabBarStyle"
- android:showDividers="beginning|middle|end"
android:id="@+id/navigation_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -38,7 +37,7 @@
style="?android:attr/actionDropDownStyle"
android:id="@+id/filter_view"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_gravity="left|center_vertical"
android:focusable="true"
android:minWidth="220dip" >
@@ -62,8 +61,9 @@
<SearchView
android:id="@+id/search_view"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_gravity="center_vertical"
+ android:layout_marginLeft="32dip"
android:maxWidth="300dip"
android:iconifiedByDefault="false" />
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index d1ff6f4..41f947a 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<resources>
- <style name="ContactBrowserTheme" parent="@android:Theme.Light.Holo">
+ <style name="ContactBrowserTheme" parent="@android:Theme.Holo.Light">
<item name="list_item_height">66dip</item>
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="android:windowContentOverlay">@null</item>
@@ -25,7 +25,7 @@
<item name="list_item_padding_right">24dip</item>
<item name="list_item_padding_bottom">0dip</item>
<item name="list_item_padding_left">0dip</item>
- <item name="list_item_gap_between_image_and_text">8dip</item>
+ <item name="list_item_gap_between_image_and_text">16dip</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>
@@ -46,7 +46,7 @@
<item name="list_item_padding_right">24dip</item>
<item name="list_item_padding_bottom">0dip</item>
<item name="list_item_padding_left">0dip</item>
- <item name="list_item_gap_between_image_and_text">8dip</item>
+ <item name="list_item_gap_between_image_and_text">16dip</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>
@@ -57,7 +57,7 @@
<item name="list_item_header_text_size">14sp</item>
</style>
- <style name="ContactsPreferencesTheme" parent="@android:Theme.Light.Holo">
+ <style name="ContactsPreferencesTheme" parent="@android:Theme.Holo.Light">
</style>
<style name="CustomContactListFilterTheme" parent="@android:Theme.Holo.Light.Dialog">
@@ -81,7 +81,7 @@
<item name="android:windowContentOverlay">@null</item>
</style>
- <style name="ContactEditorActivityTheme" parent="@android:Theme.Light.Holo">
+ <style name="ContactEditorActivityTheme" parent="@android:Theme.Holo.Light">
<item name="android:actionBarStyle">@style/TransparentActionBarStyle</item>
<item name="android:windowContentOverlay">@null</item>
</style>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 845cb2f..69f92ad 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,4 +36,7 @@
<!-- Color of the line above the contact photo in the contact detail header -->
<color name="contact_detail_header_divider_color">#FF999999</color>
+
+ <!-- Color of the text indicating the type of entry (e.g. Home, Work etc) -->
+ <color name="detail_item_type_color">#B4B4B4</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 061daaf..d55ebd6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -46,8 +46,11 @@
<!-- Minimum height of a row in the Editor -->
<dimen name="editor_min_line_item_height">48dip</dimen>
+ <!-- Minimum height of a row in the contact detail -->
+ <dimen name="detail_min_line_item_height">48dip</dimen>
+
<!-- Padding to be used between a visible scrollbar and the contact list -->
- <dimen name="list_visible_scrollbar_padding">56dip</dimen>
+ <dimen name="list_visible_scrollbar_padding">40dip</dimen>
<!-- Font size used for the contact name in the widget -->
<dimen name="widget_text_size_name">14sp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 18e694b..d543a75 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -50,7 +50,7 @@
<item name="android:windowAnimationStyle">@style/DummyAnimation</item>
</style>
- <style name="QuickContact" parent="@android:Theme.Light.Holo">
+ <style name="QuickContact" parent="@android:Theme.Holo.Light">
<item name="android:windowNoTitle">true</item>
<item name="android:windowFrame">@null</item>
<item name="android:windowBackground">@android:color/transparent</item>
diff --git a/src/com/android/contacts/RecentCallsListActivity.java b/src/com/android/contacts/RecentCallsListActivity.java
index c004ccf..0a3c178 100644
--- a/src/com/android/contacts/RecentCallsListActivity.java
+++ b/src/com/android/contacts/RecentCallsListActivity.java
@@ -1042,7 +1042,7 @@
case DIALOG_CONFIRM_DELETE_ALL:
return new AlertDialog.Builder(this)
.setTitle(R.string.clearCallLogConfirmation_title)
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(R.string.clearCallLogConfirmation)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok, new OnClickListener() {
diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
index bed532d..5dde900 100644
--- a/src/com/android/contacts/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -574,7 +574,7 @@
sb.append(groups.get(i));
}
entry.mimetype = GroupMembership.MIMETYPE;
- entry.kind = mContext.getString(R.string.groupsLabel).toUpperCase();
+ entry.kind = mContext.getString(R.string.groupsLabel);
entry.data = sb.toString();
mGroupEntries.add(entry);
}
@@ -727,7 +727,7 @@
entry.uri = ContentUris.withAppendedId(Data.CONTENT_URI, entry.id);
entry.mimetype = mimeType;
entry.kind = (kind.titleRes == -1 || kind.titleRes == 0) ? ""
- : context.getString(kind.titleRes).toUpperCase();
+ : context.getString(kind.titleRes);
entry.data = buildDataString(kind, values, context);
if (kind.typeColumn != null && values.containsKey(kind.typeColumn)) {
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 9aff1c4..d9c577e 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -800,7 +800,7 @@
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog dialog = new AlertDialog.Builder(getActivity())
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.cancel_confirmation_dialog_title)
.setMessage(R.string.cancel_confirmation_dialog_message)
.setPositiveButton(R.string.discard,
@@ -1323,7 +1323,7 @@
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity())
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.aggregation_suggestion_join_dialog_title)
.setMessage(R.string.aggregation_suggestion_join_dialog_message)
.setPositiveButton(android.R.string.yes,
@@ -1367,7 +1367,7 @@
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new AlertDialog.Builder(getActivity())
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.aggregation_suggestion_edit_dialog_title)
.setMessage(R.string.aggregation_suggestion_edit_dialog_message)
.setPositiveButton(android.R.string.yes,
diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index ad246e5..c0b3644 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -112,7 +112,7 @@
public void setKind(DataKind kind) {
mKind = kind;
TextView kindTitle = (TextView) findViewById(R.id.kind_title);
- kindTitle.setText(getResources().getString(kind.titleRes).toUpperCase());
+ kindTitle.setText(getResources().getString(kind.titleRes));
}
public void setGroupMetaData(Cursor groupMetaData) {
diff --git a/src/com/android/contacts/editor/KindSectionView.java b/src/com/android/contacts/editor/KindSectionView.java
index d0a774d..77484ce 100644
--- a/src/com/android/contacts/editor/KindSectionView.java
+++ b/src/com/android/contacts/editor/KindSectionView.java
@@ -151,7 +151,7 @@
mTitleString = (kind.titleRes == -1 || kind.titleRes == 0)
? ""
: getResources().getString(kind.titleRes);
- mTitle.setText(mTitleString.toUpperCase());
+ mTitle.setText(mTitleString);
rebuildFromState();
updateAddVisible();
diff --git a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
index 8e86b95..3259fd4 100644
--- a/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
+++ b/src/com/android/contacts/editor/SplitContactConfirmationDialogFragment.java
@@ -41,7 +41,7 @@
public Dialog onCreateDialog(Bundle savedInstanceState) {
final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(R.string.splitConfirmation_title);
- builder.setIcon(android.R.drawable.ic_dialog_alert);
+ builder.setIconAttribute(android.R.attr.alertDialogIcon);
builder.setMessage(R.string.splitConfirmation);
builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index d41230a..bc78e87 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -182,7 +182,7 @@
private void showDialog(int messageId, final Uri contactUri) {
mDialog = new AlertDialog.Builder(getActivity())
.setTitle(R.string.deleteConfirmation_title)
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(messageId)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok,
diff --git a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
index fa60079..44d31be 100644
--- a/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
+++ b/src/com/android/contacts/interactions/GroupDeletionDialogFragment.java
@@ -48,7 +48,7 @@
String message = getActivity().getString(R.string.delete_group_dialog_message, label);
return new AlertDialog.Builder(getActivity())
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.delete_group_dialog_title)
.setMessage(message)
.setPositiveButton(android.R.string.ok,
diff --git a/src/com/android/contacts/interactions/GroupNameDialogFragment.java b/src/com/android/contacts/interactions/GroupNameDialogFragment.java
index 698f756..93500be 100644
--- a/src/com/android/contacts/interactions/GroupNameDialogFragment.java
+++ b/src/com/android/contacts/interactions/GroupNameDialogFragment.java
@@ -51,7 +51,7 @@
mEdit.addTextChangedListener(this);
AlertDialog dialog = new AlertDialog.Builder(getActivity())
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(getTitleResourceId())
.setView(view)
.setPositiveButton(android.R.string.ok,
diff --git a/src/com/android/contacts/interactions/ImportExportInteraction.java b/src/com/android/contacts/interactions/ImportExportInteraction.java
index 1774946..bd8ac16 100644
--- a/src/com/android/contacts/interactions/ImportExportInteraction.java
+++ b/src/com/android/contacts/interactions/ImportExportInteraction.java
@@ -82,7 +82,7 @@
case R.id.dialog_sdcard_not_found: {
return new AlertDialog.Builder(mContext)
.setTitle(R.string.no_sdcard_title)
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(R.string.no_sdcard_message)
.setPositiveButton(android.R.string.ok, null).create();
}
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index 09409d5..c943534 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -619,7 +619,7 @@
mNameTextView = new TextView(mContext);
mNameTextView.setSingleLine(true);
mNameTextView.setEllipsize(getTextEllipsis());
- mNameTextView.setTextAppearance(mContext, android.R.style.TextAppearance_Large);
+ mNameTextView.setTextAppearance(mContext, android.R.style.TextAppearance_Medium);
mNameTextView.setGravity(Gravity.CENTER_VERTICAL);
addView(mNameTextView);
}
diff --git a/src/com/android/contacts/vcard/CancelActivity.java b/src/com/android/contacts/vcard/CancelActivity.java
index 5e3906b..b1428bb 100644
--- a/src/com/android/contacts/vcard/CancelActivity.java
+++ b/src/com/android/contacts/vcard/CancelActivity.java
@@ -108,7 +108,7 @@
case R.id.dialog_cancel_failed:
final AlertDialog.Builder builder = new AlertDialog.Builder(this)
.setTitle(R.string.cancel_vcard_import_or_export_failed)
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getString(R.string.fail_reason_unknown))
.setOnCancelListener(mCancelListener)
.setPositiveButton(android.R.string.ok, mCancelListener);
diff --git a/src/com/android/contacts/vcard/ExportVCardActivity.java b/src/com/android/contacts/vcard/ExportVCardActivity.java
index 9211aec..8bd9899 100644
--- a/src/com/android/contacts/vcard/ExportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ExportVCardActivity.java
@@ -238,7 +238,7 @@
mProcessOngoing = false;
return new AlertDialog.Builder(this)
.setTitle(R.string.no_sdcard_title)
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(R.string.no_sdcard_message)
.setPositiveButton(android.R.string.ok, this).create();
}
diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java
index 8cda708..b3376e9 100644
--- a/src/com/android/contacts/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -857,7 +857,7 @@
case R.id.dialog_sdcard_not_found: {
AlertDialog.Builder builder = new AlertDialog.Builder(this)
.setTitle(R.string.no_sdcard_title)
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(R.string.no_sdcard_message)
.setOnCancelListener(mCancelListener)
.setPositiveButton(android.R.string.ok, mCancelListener);
@@ -905,7 +905,7 @@
getString(R.string.fail_reason_io_error)));
AlertDialog.Builder builder = new AlertDialog.Builder(this)
.setTitle(R.string.scanning_sdcard_failed_title)
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(message)
.setOnCancelListener(mCancelListener)
.setPositiveButton(android.R.string.ok, mCancelListener);
@@ -919,7 +919,7 @@
}
final AlertDialog.Builder builder = new AlertDialog.Builder(this)
.setTitle(getString(R.string.reading_vcard_failed_title))
- .setIcon(android.R.drawable.ic_dialog_alert)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(message)
.setOnCancelListener(mCancelListener)
.setPositiveButton(android.R.string.ok, mCancelListener);