| commit | 7a17ed06783f8c3fe51975aa2fc698942785009e | [log] [tgz] |
|---|---|---|
| author | Daisuke Miyakawa <dmiyakawa@google.com> | Thu Oct 13 12:43:15 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 13 12:43:15 2011 -0700 |
| tree | de0ded96d614d4eafa8426e9e4fccf9b6770e43f | |
| parent | cf691ad204923258f25446450c42e502652a7321 [diff] | |
| parent | 0e52f40b8469382613eb666fe7d5f39b4dbb4e90 [diff] |
am 0e52f40b: Merge "Fix possible NPE in ContactPhotoManager." into ics-mr0 * commit '0e52f40b8469382613eb666fe7d5f39b4dbb4e90': Fix possible NPE in ContactPhotoManager.
diff --git a/res/drawable-hdpi/ic_contact_picture_180_holo_dark.png b/res/drawable-hdpi/ic_contact_picture_180_holo_dark.png index 278c121..a17da61 100644 --- a/res/drawable-hdpi/ic_contact_picture_180_holo_dark.png +++ b/res/drawable-hdpi/ic_contact_picture_180_holo_dark.png Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_picture_180_holo_light.png b/res/drawable-hdpi/ic_contact_picture_180_holo_light.png index 0ce49fe..38e4c30 100644 --- a/res/drawable-hdpi/ic_contact_picture_180_holo_light.png +++ b/res/drawable-hdpi/ic_contact_picture_180_holo_light.png Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_picture_holo_dark.png b/res/drawable-hdpi/ic_contact_picture_holo_dark.png index de9157e..314fa00 100644 --- a/res/drawable-hdpi/ic_contact_picture_holo_dark.png +++ b/res/drawable-hdpi/ic_contact_picture_holo_dark.png Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_picture_holo_light.png b/res/drawable-hdpi/ic_contact_picture_holo_light.png index 2eef7b5..4c0e35e 100644 --- a/res/drawable-hdpi/ic_contact_picture_holo_light.png +++ b/res/drawable-hdpi/ic_contact_picture_holo_light.png Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_picture_180_holo_dark.png b/res/drawable-mdpi/ic_contact_picture_180_holo_dark.png index cc5dd09..acba333 100644 --- a/res/drawable-mdpi/ic_contact_picture_180_holo_dark.png +++ b/res/drawable-mdpi/ic_contact_picture_180_holo_dark.png Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_picture_180_holo_light.png b/res/drawable-mdpi/ic_contact_picture_180_holo_light.png index 77539d3..0b52683 100644 --- a/res/drawable-mdpi/ic_contact_picture_180_holo_light.png +++ b/res/drawable-mdpi/ic_contact_picture_180_holo_light.png Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_picture_holo_dark.png b/res/drawable-mdpi/ic_contact_picture_holo_dark.png index fb365c4..6876777 100644 --- a/res/drawable-mdpi/ic_contact_picture_holo_dark.png +++ b/res/drawable-mdpi/ic_contact_picture_holo_dark.png Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_picture_holo_light.png b/res/drawable-mdpi/ic_contact_picture_holo_light.png index 6c7cb61..ead9718 100644 --- a/res/drawable-mdpi/ic_contact_picture_holo_light.png +++ b/res/drawable-mdpi/ic_contact_picture_holo_light.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_contact_picture_180_holo_dark.png b/res/drawable-xhdpi/ic_contact_picture_180_holo_dark.png index b8ee922..c4c001e 100644 --- a/res/drawable-xhdpi/ic_contact_picture_180_holo_dark.png +++ b/res/drawable-xhdpi/ic_contact_picture_180_holo_dark.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_contact_picture_180_holo_light.png b/res/drawable-xhdpi/ic_contact_picture_180_holo_light.png index 9727b45..f6fd172 100644 --- a/res/drawable-xhdpi/ic_contact_picture_180_holo_light.png +++ b/res/drawable-xhdpi/ic_contact_picture_180_holo_light.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_contact_picture_holo_dark.png b/res/drawable-xhdpi/ic_contact_picture_holo_dark.png index 9fa0698..ddf797f 100644 --- a/res/drawable-xhdpi/ic_contact_picture_holo_dark.png +++ b/res/drawable-xhdpi/ic_contact_picture_holo_dark.png Binary files differ
diff --git a/res/drawable-xhdpi/ic_contact_picture_holo_light.png b/res/drawable-xhdpi/ic_contact_picture_holo_light.png index 1a2bfde..05a65f6 100644 --- a/res/drawable-xhdpi/ic_contact_picture_holo_light.png +++ b/res/drawable-xhdpi/ic_contact_picture_holo_light.png Binary files differ
diff --git a/res/values-long-land/dimens.xml b/res/values-long-land/dimens.xml deleted file mode 100644 index 2046eb0..0000000 --- a/res/values-long-land/dimens.xml +++ /dev/null
@@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> -<resources> - <dimen name="dialpad_digits_margin_bottom">30dip</dimen> - <dimen name="dialpad_digits_text_size">34sp</dimen> -</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml index c30e09e..ed88aaa 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml
@@ -1053,17 +1053,6 @@ <!-- Header for the list of all groups for a contact [CHAR LIMIT=20] --> <string name="groupsLabel">Groups</string> - <!-- Single-character overlay for home phone numbers when creating desktop shortcuts --> - <string name="type_short_home">H</string> - <!-- Single-character overlay for mobile phone numbers when creating desktop shortcuts --> - <string name="type_short_mobile">M</string> - <!-- Single-character overlay for work phone numbers when creating desktop shortcuts --> - <string name="type_short_work">W</string> - <!-- Single-character overlay for pager phone numbers when creating desktop shortcuts --> - <string name="type_short_pager">P</string> - <!-- Single-character overlay for other phone numbers when creating desktop shortcuts --> - <string name="type_short_other">O</string> - <string name="dialog_new_contact_account">Create contact under account</string> <!-- Title for the disambiguation dialog that requests the user choose an account for the new group to be created under [CHAR LIMIT=NONE] -->
