diff options
| author | Daniel Lehmann <lehmannd@google.com> | 2010-05-03 09:56:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-03 09:56:48 -0700 |
| commit | edd904fd317838c526b16d983af22d5a3dc1cd3b (patch) | |
| tree | 420f4c764839009792093998c64fef63daa9c706 /core/res | |
| parent | c49e010d196bc29c6b58de956fdca92ecb30f077 (diff) | |
| parent | 88e26c21ccd793311917e0bce984b9a0a2293783 (diff) | |
| download | frameworks_base-edd904fd317838c526b16d983af22d5a3dc1cd3b.zip frameworks_base-edd904fd317838c526b16d983af22d5a3dc1cd3b.tar.gz frameworks_base-edd904fd317838c526b16d983af22d5a3dc1cd3b.tar.bz2 | |
Merge "Allow contact-sources to rename the term "All Contacts""
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 67a88ae..fd00330 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -3630,6 +3630,9 @@ <attr name="detailColumn" format="string" /> <!-- Flag indicating that detail should be built from SocialProvider. --> <attr name="detailSocialSummary" format="boolean" /> + <!-- Resource representing the term "All Contacts" (e.g. "All Friends" or + "All connections"). Optional (Default is "All Contacts"). --> + <attr name="allContactsName" format="string" /> </declare-styleable> <!-- =============================== --> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index fb50735..fe27174 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1274,5 +1274,6 @@ <public type="attr" name="column" /> <public type="attr" name="withExpression" /> <public type="attr" name="withClass" /> + <public type="attr" name="allContactsName" /> </resources> |