commit 9676038b6e9fb66760588d7f9c9c642cc493dd71
author Tadashi G. Takaoka <takaoka@google.com> Mon Sep 05 17:22:34 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Mon Sep 05 18:59:37 2011 +0900
tree cb18b5e73ba938caca65d00ca4a928993cb84b1a
parent 1d8ec1cb9fb2c395873566438fe63e46b9e535da

Introduce maxMoreSuggestionsRow and minMoreSuggetionsWidth attributes to SuggestionsView

Bug: 5257594
Change-Id: Id52c841b72e38eb9034a1a7f26bcf3d4d81ad216

java/res/values/attrs.xml

diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 2af2554..20f1e32 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -124,6 +124,8 @@
         <attr name="colorSuggested" format="color" />
         <attr name="suggestionsCountInStrip" format="integer" />
         <attr name="centerSuggestionPercentile" format="integer" />
+        <attr name="maxMoreSuggestionsRow" format="integer" />
+        <attr name="minMoreSuggestionsWidth" format="float" />
     </declare-styleable>
 
     <declare-styleable name="Keyboard">

java/res/values/dimens.xml

diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 0ec65e3..e753474 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -80,8 +80,11 @@
     <dimen name="more_suggestions_key_horizontal_padding">12dip</dimen>
     <dimen name="more_suggestions_row_height">40dip</dimen>
     <dimen name="more_suggestions_slide_allowance">0.2in</dimen>
+    <integer name="max_more_suggestions_row">6</integer>
+    <fraction name="min_more_suggestions_width">90%</fraction>
     <fraction name="more_suggestions_info_ratio">18%</fraction>
-    <dimen name="key_preview_backing_height">40dip</dimen>
+    <!-- key_preview_backing_height = more_suggestions_row_height * max_more_suggestions_row -->
+    <dimen name="key_preview_backing_height">160dip</dimen>
     <dimen name="suggestions_strip_padding">0dip</dimen>
     <dimen name="suggestion_min_width">44dip</dimen>
     <dimen name="suggestion_padding">6dip</dimen>

java/res/values/styles.xml

diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 45b98ca..dc2021a 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -92,6 +92,8 @@
         <item name="colorSuggested">#FFFCAE00</item>
         <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item>
         <item name="centerSuggestionPercentile">@integer/center_suggestion_percentile</item>
+        <item name="maxMoreSuggestionsRow">@integer/max_more_suggestions_row</item>
+        <item name="minMoreSuggestionsWidth">@fraction/min_more_suggestions_width</item>
     </style>
     <style
         name="MoreSuggestionsViewStyle"
@@ -242,6 +244,8 @@
         <item name="colorSuggested">#FFA7A9AC</item>
         <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item>
         <item name="centerSuggestionPercentile">@integer/center_suggestion_percentile</item>
+        <item name="maxMoreSuggestionsRow">@integer/max_more_suggestions_row</item>
+        <item name="minMoreSuggestionsWidth">@fraction/min_more_suggestions_width</item>
     </style>
     <style
         name="MoreSuggestionsViewStyle.IceCreamSandwich"