Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Center box text vertically"

Browse Source
This commit is contained in:
Russell Brenner
2011-10-03 11:29:16 -07:00
committed by Android (Google) Code Review
parent 58d807f66a b76b3b1c81
commit e4255b1769
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/webkit/WebTextView.java
View File

@@ -1092,4 +1092,11 @@ import junit.framework.Assert;
return url != null ? url.getProtocol() + "://" + url.getHost() + url.getPath() : null; return url != null ? url.getProtocol() + "://" + url.getHost() + url.getPath() : null;
} }
public void setGravityForRtl(boolean rtl) {
int gravity = rtl ? Gravity.RIGHT : Gravity.LEFT;
gravity |= mSingle ? Gravity.CENTER_VERTICAL : Gravity.TOP;
setGravity(gravity);
}
} }

4
core/java/android/webkit/WebView.java
View File

@@ -4760,12 +4760,12 @@ public class WebView extends AbsoluteLayout
} }
String text = nativeFocusCandidateText(); String text = nativeFocusCandidateText();
int nodePointer = nativeFocusCandidatePointer(); int nodePointer = nativeFocusCandidatePointer();
mWebTextView.setGravity(nativeFocusCandidateIsRtlText() ?
Gravity.RIGHT : Gravity.NO_GRAVITY);
// This needs to be called before setType, which may call // This needs to be called before setType, which may call
// requestFormData, and it needs to have the correct nodePointer. // requestFormData, and it needs to have the correct nodePointer.
mWebTextView.setNodePointer(nodePointer); mWebTextView.setNodePointer(nodePointer);
mWebTextView.setType(nativeFocusCandidateType()); mWebTextView.setType(nativeFocusCandidateType());
// Gravity needs to be set after setType
mWebTextView.setGravityForRtl(nativeFocusCandidateIsRtlText());
updateWebTextViewPadding(); updateWebTextViewPadding();
if (null == text) { if (null == text) {
if (DebugFlags.WEB_VIEW) { if (DebugFlags.WEB_VIEW) {