From ae499953ce0e00aae78f374514d4bcc6b99c8354 Mon Sep 17 00:00:00 2001
From: Evan JIANG <firstfan@gmail.com>
Date: Sun, 2 Nov 2008 09:47:52 +0800
Subject: [PATCH] Fix issue 1164: Incorrect organization type label in contacts

http://code.google.com/p/android/issues/detail?id=1164
The organization definition in string-array resource is different from
android.provider.Contacts.OrganizationColumns
---
 core/java/android/provider/Contacts.java | 4 ++--
 core/res/res/values/strings.xml          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/java/android/provider/Contacts.java b/core/java/android/provider/Contacts.java
index 91b1853471d45..8ad9b1666a6c2 100644
--- a/core/java/android/provider/Contacts.java
+++ b/core/java/android/provider/Contacts.java
@@ -1170,7 +1170,7 @@ public class Contacts {
      */
     public interface OrganizationColumns {
         /**
-         * The type of the the phone number.
+         * The type of the organizations.
          * <P>Type: INTEGER (one of the constants below)</P>
          */
         public static final String TYPE = "type";
@@ -1229,7 +1229,7 @@ public class Contacts {
                 try {
                     display = labels[type - 1];
                 } catch (ArrayIndexOutOfBoundsException e) {
-                    display = labels[People.Phones.TYPE_HOME - 1];
+                    display = labels[Organizations.TYPE_WORK - 1];
                 }
             } else {
                 if (!TextUtils.isEmpty(label)) {
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index bec3bc870179c..c64d70db65a85 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -731,7 +731,6 @@
     <!-- Organization types from android.provider.Contacts -->
     <string-array name="organizationTypes">
         <!-- The order of these is important, don't reorder without changing Contacts.java -->
-        <item>Home</item>
         <item>Work</item>
         <item>Other</item>
         <item>Custom\u2026</item>