Merge "Prevent formatting the number as it was formatted."
diff --git a/res/drawable-xlarge/contact_list_bg.png b/res/drawable-xlarge/contact_list_bg.png
index f4a6ebb..ead9603 100644
--- a/res/drawable-xlarge/contact_list_bg.png
+++ b/res/drawable-xlarge/contact_list_bg.png
Binary files differ
diff --git a/res/drawable-xlarge/contact_view_background_left.xml b/res/drawable-xlarge/contact_view_background_left.xml
deleted file mode 100644
index e2fabae..0000000
--- a/res/drawable-xlarge/contact_view_background_left.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<shape
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <gradient
- android:angle="270"
- android:startColor="#ff6a9cff"
- android:endColor="#c9d7e1f5"
- android:type="linear" />
-</shape>
diff --git a/res/layout-xlarge/contact_detail_fragment.xml b/res/layout-xlarge/contact_detail_fragment.xml
index 132d87d..e575ed3 100644
--- a/res/layout-xlarge/contact_detail_fragment.xml
+++ b/res/layout-xlarge/contact_detail_fragment.xml
@@ -18,33 +18,15 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:ex="http://schemas.android.com/apk/res/com.android.contacts"
android:layout_width="match_parent"
- android:layout_height="match_parent">
- <!-- Background -->
- <com.android.contacts.widget.InterpolatingLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <View
- android:layout_width="208dip"
- android:layout_height="match_parent"
- android:background="@drawable/contact_view_background_left"
- ex:layout_wideParentWidth="800dip"
- ex:layout_wideWidth="210dip"
- ex:layout_narrowParentWidth="500dip"
- ex:layout_narrowWidth="40dip"
- />
- <View
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#bff3f3f3" />
- </com.android.contacts.widget.InterpolatingLayout>
-
- <!-- Content -->
+ android:layout_height="match_parent"
+ android:background="#bff3f3f3">
<LinearLayout
android:id="@+id/contact_detail"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
+ <!-- Header View (including social status) -->
<com.android.contacts.widget.InterpolatingLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -53,12 +35,34 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
ex:layout_wideParentWidth="800dip"
- ex:layout_wideLeftMargin="130dip"
+ ex:layout_wideLeftMargin="80dip"
ex:layout_narrowParentWidth="500dip"
ex:layout_narrowLeftMargin="15dip"
/>
</com.android.contacts.widget.InterpolatingLayout>
+ <!-- Placeholder for empty list -->
+ <com.android.contacts.widget.InterpolatingLayout
+ android:id="@android:id/empty"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="gone">
+ <TextView android:id="@+id/emptyText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/no_contact_details"
+ android:textSize="20sp"
+ android:textColor="?android:attr/textColorSecondary"
+ ex:layout_wideParentWidth="800dip"
+ ex:layout_wideLeftMargin="144dip"
+ ex:layout_narrowParentWidth="500dip"
+ ex:layout_narrowLeftMargin="42dip"
+ android:paddingTop="10dip"
+ android:lineSpacingMultiplier="0.92"
+ />
+ </com.android.contacts.widget.InterpolatingLayout>
+
+ <!-- Real list -->
<com.android.contacts.widget.InterpolatingLayout
android:layout_width="match_parent"
android:layout_height="0px"
@@ -67,31 +71,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
ex:layout_wideParentWidth="800dip"
- ex:layout_wideLeftMargin="230dip"
+ ex:layout_wideLeftMargin="144dip"
ex:layout_narrowParentWidth="500dip"
ex:layout_narrowLeftMargin="42dip"
android:cacheColorHint="#00000000"
/>
</com.android.contacts.widget.InterpolatingLayout>
-
- <ScrollView android:id="@android:id/empty"
- android:layout_width="match_parent"
- android:layout_height="0px"
- android:layout_weight="1"
- android:paddingLeft="230dip"
- android:visibility="gone"
- >
- <TextView android:id="@+id/emptyText"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/no_contact_details"
- android:textSize="20sp"
- android:textColor="?android:attr/textColorSecondary"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
- android:paddingTop="10dip"
- android:lineSpacingMultiplier="0.92"
- />
- </ScrollView>
</LinearLayout>
</FrameLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge/contact_editor_fragment.xml b/res/layout-xlarge/contact_editor_fragment.xml
index 59f1931..fb9e79c 100644
--- a/res/layout-xlarge/contact_editor_fragment.xml
+++ b/res/layout-xlarge/contact_editor_fragment.xml
@@ -19,28 +19,9 @@
xmlns:ex="http://schemas.android.com/apk/res/com.android.contacts"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="#bff3f3f3"
>
- <!-- Background -->
- <com.android.contacts.widget.InterpolatingLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <View
- android:layout_width="208dip"
- android:layout_height="match_parent"
- android:background="@drawable/contact_view_background_left"
- ex:layout_wideParentWidth="1280dip"
- ex:layout_wideWidth="210dip"
- ex:layout_narrowParentWidth="800dip"
- ex:layout_narrowWidth="40dip"
- />
- <View
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#bff3f3f3" />
- </com.android.contacts.widget.InterpolatingLayout>
-
- <!-- Content -->
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/src/com/android/contacts/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
index bb72e69..7e2c4c2 100644
--- a/src/com/android/contacts/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -250,10 +250,9 @@
if (photoId != 0) {
getPhotoLoader().loadPhoto(view.getPhotoView(), photoId);
} else {
- String photoUri = cursor.getString(CONTACT_PHOTO_URI_COLUMN_INDEX);
- if (photoUri != null) {
- getPhotoLoader().loadPhoto(view.getPhotoView(), Uri.parse(photoUri));
- }
+ final String photoUriString = cursor.getString(CONTACT_PHOTO_URI_COLUMN_INDEX);
+ final Uri photoUri = photoUriString == null ? null : Uri.parse(photoUriString);
+ getPhotoLoader().loadPhoto(view.getPhotoView(), photoUri);
}
}
