aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2010-09-16 04:43:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-16 04:43:33 -0700
commit37a8c654a0cb9728451623dc1eed13ec9767b889 (patch)
treeed935498523f679041b0063472421f224a8c7f73 /java
parent37600e29ab7cfe95a7c5c340e44ca9dbbee0adfb (diff)
parent809bef520b4d062915f6aa85dd5690498e0c4fc8 (diff)
downloadlatinime-37a8c654a0cb9728451623dc1eed13ec9767b889.tar.gz
latinime-37a8c654a0cb9728451623dc1eed13ec9767b889.tar.xz
latinime-37a8c654a0cb9728451623dc1eed13ec9767b889.zip
am 809bef52: Merge "Increase gradient of suggestion bar" into gingerbread
Merge commit '809bef520b4d062915f6aa85dd5690498e0c4fc8' into gingerbread-plus-aosp * commit '809bef520b4d062915f6aa85dd5690498e0c4fc8': Increase gradient of suggestion bar
Diffstat (limited to 'java')
-rw-r--r--java/res/layout/candidates.xml2
-rw-r--r--java/res/values-land/dimens.xml1
-rw-r--r--java/res/values/dimens.xml1
-rwxr-xr-xjava/src/com/android/inputmethod/latin/CandidateView.java1
4 files changed, 4 insertions, 1 deletions
diff --git a/java/res/layout/candidates.xml b/java/res/layout/candidates.xml
index 478e20ba1..b89d44290 100644
--- a/java/res/layout/candidates.xml
+++ b/java/res/layout/candidates.xml
@@ -31,6 +31,8 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/candidate_strip_height"
android:layout_weight="1"
+ android:fadingEdge="horizontal"
+ android:fadingEdgeLength="@dimen/candidate_strip_fading_edge_length"
/>
</LinearLayout>
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
index 4f87b79d2..ac0e030d4 100644
--- a/java/res/values-land/dimens.xml
+++ b/java/res/values-land/dimens.xml
@@ -21,6 +21,7 @@
<resources>
<dimen name="key_height">47dip</dimen>
<dimen name="candidate_strip_height">38dip</dimen>
+ <dimen name="candidate_strip_fading_edge_length">63dip</dimen>
<dimen name="spacebar_vertical_correction">2dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- key_height * 1.7 -->
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index af8b38110..b399af489 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -22,6 +22,7 @@
<dimen name="key_height">54dip</dimen>
<dimen name="bubble_pointer_offset">22dip</dimen>
<dimen name="candidate_strip_height">42dip</dimen>
+ <dimen name="candidate_strip_fading_edge_length">63dip</dimen>
<dimen name="spacebar_vertical_correction">4dip</dimen>
<!-- If the screen height in landscape is larger than the below value, then the keyboard
will not go into extract (fullscreen) mode. -->
diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index bd73c6fb8..b84417b43 100755
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -186,7 +186,6 @@ public class CandidateView extends View {
return true;
}
});
- setHorizontalFadingEdgeEnabled(true);
setWillNotDraw(false);
setHorizontalScrollBarEnabled(false);
setVerticalScrollBarEnabled(false);