diff options
| author | Daniel Lehmann <lehmannd@google.com> | 2010-11-01 20:25:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-01 20:25:31 -0700 |
| commit | 2444ddb3d9b59ec45ba50858fcbff639e59b93b1 (patch) | |
| tree | dcbe97198f2101002e8827301babb67aafcb23d1 | |
| parent | 51d10323e9a7374403c2b13befcff5b76c668ca5 (diff) | |
| parent | dd384a7453b61af8b606f8974c20431c545c3800 (diff) | |
| download | frameworks_base-2444ddb3d9b59ec45ba50858fcbff639e59b93b1.zip frameworks_base-2444ddb3d9b59ec45ba50858fcbff639e59b93b1.tar.gz frameworks_base-2444ddb3d9b59ec45ba50858fcbff639e59b93b1.tar.bz2 | |
Merge "Added missing label and char limits"
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 2 | ||||
| -rwxr-xr-x | core/res/res/values/strings.xml | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 9e6434a..f0aa878 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -5245,7 +5245,7 @@ public final class ContactsContract { return com.android.internal.R.string.eventTypeAnniversary; case TYPE_BIRTHDAY: return com.android.internal.R.string.eventTypeBirthday; case TYPE_OTHER: return com.android.internal.R.string.eventTypeOther; - default: return com.android.internal.R.string.eventTypeOther; + default: return com.android.internal.R.string.eventTypeCustom; } } } diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index f8c7b69..541835f 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1381,12 +1381,14 @@ <!-- MMS phone number type --> <string name="phoneTypeMms">MMS</string> - <!-- Label for a birthday event --> + <!-- Label for custom events [CHAR LIMIT=20] --> + <string name="eventTypeCustom">Custom</string> + <!-- Label for a birthday event [CHAR LIMIT=20] --> <string name="eventTypeBirthday">Birthday</string> - <!-- Label for an anniversary event --> + <!-- Label for an anniversary event [CHAR LIMIT=20] --> <string name="eventTypeAnniversary">Anniversary</string> - <!-- Label for other events --> - <string name="eventTypeOther">Event</string> + <!-- Label for other events [CHAR LIMIT=20] --> + <string name="eventTypeOther">Other</string> <!-- Custom email type --> <string name="emailTypeCustom">Custom</string> |