diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-08-28 00:04:20 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-28 00:04:20 -0700 |
| commit | 585b610b959b38e538fbf79126ecce2cb9ac358d (patch) | |
| tree | 5f238f7c955f8ccf0fa567cc17dcf0b5b382bbf6 /java/res | |
| parent | d262b846fac59f89276a234095d11f07f2d74d4f (diff) | |
| parent | ef2bfad5903fb55adca61dbea51984fbc7e4375f (diff) | |
| download | latinime-585b610b959b38e538fbf79126ecce2cb9ac358d.tar.gz latinime-585b610b959b38e538fbf79126ecce2cb9ac358d.tar.xz latinime-585b610b959b38e538fbf79126ecce2cb9ac358d.zip | |
am ef2bfad5: Use TypedArray.getFraction to read percentile values in resource
* commit 'ef2bfad5903fb55adca61dbea51984fbc7e4375f':
Use TypedArray.getFraction to read percentile values in resource
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/attrs.xml | 12 | ||||
| -rw-r--r-- | java/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | java/res/values/styles.xml | 14 |
3 files changed, 14 insertions, 14 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index cced45d9f..de732fb63 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -187,13 +187,13 @@ <attr name="colorTypedWord" format="color" /> <attr name="colorAutoCorrect" format="color" /> <attr name="colorSuggested" format="color" /> - <attr name="alphaValidTypedWord" format="integer" /> - <attr name="alphaTypedWord" format="integer" /> - <attr name="alphaAutoCorrect" format="integer" /> - <attr name="alphaSuggested" format="integer" /> - <attr name="alphaObsoleted" format="integer" /> + <attr name="alphaValidTypedWord" format="fraction" /> + <attr name="alphaTypedWord" format="fraction" /> + <attr name="alphaAutoCorrect" format="fraction" /> + <attr name="alphaSuggested" format="fraction" /> + <attr name="alphaObsoleted" format="fraction" /> <attr name="suggestionsCountInStrip" format="integer" /> - <attr name="centerSuggestionPercentile" format="integer" /> + <attr name="centerSuggestionPercentile" format="fraction" /> <attr name="maxMoreSuggestionsRow" format="integer" /> <attr name="minMoreSuggestionsWidth" format="float" /> </declare-styleable> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index c59bad302..565059b10 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -92,7 +92,7 @@ <dimen name="suggestion_text_size">18dp</dimen> <dimen name="more_suggestions_hint_text_size">27dp</dimen> <integer name="suggestions_count_in_strip">3</integer> - <integer name="center_suggestion_percentile">36</integer> + <fraction name="center_suggestion_percentile">36%</fraction> <!-- Gesture preview parameters --> <dimen name="gesture_preview_trail_width">2.5dp</dimen> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index e5e7fed80..ccf378a69 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -138,9 +138,9 @@ <item name="colorTypedWord">@android:color/white</item> <item name="colorAutoCorrect">#FFFCAE00</item> <item name="colorSuggested">#FFFCAE00</item> - <item name="alphaObsoleted">50</item> + <item name="alphaObsoleted">50%</item> <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item> - <item name="centerSuggestionPercentile">@integer/center_suggestion_percentile</item> + <item name="centerSuggestionPercentile">@fraction/center_suggestion_percentile</item> <item name="maxMoreSuggestionsRow">@integer/max_more_suggestions_row</item> <item name="minMoreSuggestionsWidth">@fraction/min_more_suggestions_width</item> </style> @@ -373,12 +373,12 @@ <item name="colorTypedWord">@android:color/holo_blue_light</item> <item name="colorAutoCorrect">@android:color/holo_blue_light</item> <item name="colorSuggested">@android:color/holo_blue_light</item> - <item name="alphaValidTypedWord">85</item> - <item name="alphaTypedWord">85</item> - <item name="alphaSuggested">70</item> - <item name="alphaObsoleted">70</item> + <item name="alphaValidTypedWord">85%</item> + <item name="alphaTypedWord">85%</item> + <item name="alphaSuggested">70%</item> + <item name="alphaObsoleted">70%</item> <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item> - <item name="centerSuggestionPercentile">@integer/center_suggestion_percentile</item> + <item name="centerSuggestionPercentile">@fraction/center_suggestion_percentile</item> <item name="maxMoreSuggestionsRow">@integer/max_more_suggestions_row</item> <item name="minMoreSuggestionsWidth">@fraction/min_more_suggestions_width</item> </style> |