aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-01-21 23:42:19 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-21 23:42:19 -0800
commit0390acf1ba37c075fc8b67196ef03e2941286bee (patch)
treef3faa7cc866a0c5ebd4d1696c7ae419f6847a292 /java/res
parent41fcc80e14aac0e284d245e63e334addc3786f22 (diff)
parent8028c1c523b2b7a83ca3f887818bdf9399f20f9b (diff)
downloadlatinime-0390acf1ba37c075fc8b67196ef03e2941286bee.tar.gz
latinime-0390acf1ba37c075fc8b67196ef03e2941286bee.tar.xz
latinime-0390acf1ba37c075fc8b67196ef03e2941286bee.zip
am 8028c1c5: Merge "SeekBarDialogPreference supports minValue and stepValue"
* commit '8028c1c523b2b7a83ca3f887818bdf9399f20f9b': SeekBarDialogPreference supports minValue and stepValue
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index e10bdb16d..c41263515 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -435,5 +435,7 @@
<declare-styleable name="SeekBarDialogPreference">
<attr name="valueFormatText" format="reference" />
<attr name="maxValue" format="integer" />
+ <attr name="minValue" format="integer" />
+ <attr name="stepValue" format="integer" />
</declare-styleable>
</resources>