diff options
| author | Winson Chung <winsonc@google.com> | 2012-05-24 10:26:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-24 10:26:20 -0700 |
| commit | a7075f96d0cc9610c06680ea1d241f6c0a8c69ae (patch) | |
| tree | 15a8d1d5a2ffedaec805a716c04319d3e323d6f3 | |
| parent | 1e2abeafb96fecadb709c63d430c21b56c5be451 (diff) | |
| parent | bd247198516be22cbf56b1a828c7dd43f9848591 (diff) | |
| download | android_packages_apps_Trebuchet-a7075f96d0cc9610c06680ea1d241f6c0a8c69ae.tar.gz android_packages_apps_Trebuchet-a7075f96d0cc9610c06680ea1d241f6c0a8c69ae.tar.bz2 android_packages_apps_Trebuchet-a7075f96d0cc9610c06680ea1d241f6c0a8c69ae.zip | |
am bd247198: Merge "Fixing issue with resource ids. (Bug 6532243)" into jb-dev
* commit 'bd247198516be22cbf56b1a828c7dd43f9848591':
Fixing issue with resource ids. (Bug 6532243)
| -rw-r--r-- | res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | res/values/strings.xml | 12 | ||||
| -rw-r--r-- | res/values/styles.xml | 6 |
3 files changed, 24 insertions, 0 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 224daac53..c76a6a5c4 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -157,4 +157,10 @@ <attr name="key" format="string" /> <attr name="value" format="string" /> </declare-styleable> + + <!-- Only used in the device overlays --> + <declare-styleable name="CustomClingTitleText"> + </declare-styleable> + <declare-styleable name="CustomClingText"> + </declare-styleable> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1416d40e9..4aee339e4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -260,4 +260,16 @@ s --> <!-- Folder name format --> <string name="folder_name_format">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g></string> + <!-- Strings used in device overlays --> + + <!-- Clings --> + <!-- Dummy string [CHAR_LIMIT=40] --> + <string name="custom_workspace_cling_title_1"></string> + <!-- Dummy string [CHAR_LIMIT=60] --> + <string name="custom_workspace_cling_description_1"></string> + <!-- Dummy string [CHAR_LIMIT=40] --> + <string name="custom_workspace_cling_title_2"></string> + <!-- Dummy string [CHAR_LIMIT=60] --> + <string name="custom_workspace_cling_description_2"></string> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 3d935a164..08c98c9f2 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -186,4 +186,10 @@ <item name="android:shadowDy">0.0</item> <item name="android:shadowRadius">2.0</item> </style> + + <!-- Overridden in device overlays --> + <style name="CustomClingTitleText"> + </style> + <style name="CustomClingText"> + </style> </resources> |