am a7075f96: am bd247198: Merge "Fixing issue with resource ids. (Bug 6532243)" into jb-dev

* commit 'a7075f96d0cc9610c06680ea1d241f6c0a8c69ae':
  Fixing issue with resource ids. (Bug 6532243)
This commit is contained in:
Winson Chung
2012-05-24 11:13:30 -07:00
committed by Android Git Automerger
3 changed files with 24 additions and 0 deletions
+6
View File
@@ -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>
+12
View File
@@ -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>
+6
View File
@@ -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>