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

am b078a7f7: am a8da1735: Do not show radio/checkboxes for <optgroup> labels.

Browse Source 
Merge commit 'b078a7f780f2aaf3917660902fd839abada5e167'

* commit 'b078a7f780f2aaf3917660902fd839abada5e167':
  Do not show radio/checkboxes for <optgroup> labels.
This commit is contained in:
Leon Scroggins
2009-10-21 07:32:53 -07:00
committed by Android Git Automerger
parent 6a19d0e139 b078a7f780
commit 2e7b1b7d4c
3 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,7 @@ import android.widget.AbsoluteLayout;
import android.widget.Adapter;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.CheckedTextView;
import android.widget.FrameLayout;
import android.widget.ListView;
import android.widget.Scroller;
@@ -5299,8 +5300,16 @@ public class WebView extends AbsoluteLayout
// Need these to provide stable ids to my ArrayAdapter,
// which normally does not have stable ids. (Bug 1250098)
private class Container extends Object {
/**
* Possible values for mEnabled. Keep in sync with OptionStatus in
* WebViewCore.cpp
*/
final static int OPTGROUP = -1;
final static int OPTION_DISABLED = 0;
final static int OPTION_ENABLED = 1;
String mString;
boolean mEnabled;
int mEnabled;
int mId;
public String toString() {
@@ -5320,6 +5329,23 @@ public class WebView extends AbsoluteLayout
objects);
}
@Override
public View getView(int position, View convertView,
ViewGroup parent) {
// Always pass in null so that we will get a new CheckedTextView
// Otherwise, an item which was previously used as an <optgroup>
// element (i.e. has no check), could get used as an <option>
// element, which needs a checkbox/radio, but it would not have
// one.
convertView = super.getView(position, null, parent);
Container c = item(position);
if (c != null && Container.OPTGROUP == c.mEnabled
&& convertView instanceof CheckedTextView) {
((CheckedTextView) convertView).setCheckMarkDrawable(null);
}
return convertView;
}
@Override
public boolean hasStableIds() {
// AdapterView's onChanged method uses this to determine whether
@@ -5355,12 +5381,11 @@ public class WebView extends AbsoluteLayout
if (item == null) {
return false;
}
return item.mEnabled;
return Container.OPTION_ENABLED == item.mEnabled;
}
}
private InvokeListBox(String[] array,
boolean[] enabled, int[] selected) {
private InvokeListBox(String[] array, int[] enabled, int[] selected) {
mMultiple = true;
mSelectedArray = selected;
@@ -5374,8 +5399,7 @@ public class WebView extends AbsoluteLayout
}
}
private InvokeListBox(String[] array, boolean[] enabled, int
selection) {
private InvokeListBox(String[] array, int[] enabled, int selection) {
mSelection = selection;
mMultiple = false;
@@ -5506,10 +5530,11 @@ public class WebView extends AbsoluteLayout
* Request a dropdown menu for a listbox with multiple selection.
*
* @param array Labels for the listbox.
* @param enabledArray Which positions are enabled.
* @param enabledArray State for each element in the list. See static
* integers in Container class.
* @param selectedArray Which positions are initally selected.
*/
void requestListBox(String[] array, boolean[]enabledArray, int[]
void requestListBox(String[] array, int[] enabledArray, int[]
selectedArray) {
mPrivateHandler.post(
new InvokeListBox(array, enabledArray, selectedArray));
@@ -5520,10 +5545,11 @@ public class WebView extends AbsoluteLayout
* <select> element.
*
* @param array Labels for the listbox.
* @param enabledArray Which positions are enabled.
* @param enabledArray State for each element in the list. See static
* integers in Container class.
* @param selection Which position is initally selected.
*/
void requestListBox(String[] array, boolean[]enabledArray, int selection) {
void requestListBox(String[] array, int[] enabledArray, int selection) {
mPrivateHandler.post(
new InvokeListBox(array, enabledArray, selection));
}

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

@@ -2141,7 +2141,7 @@ final class WebViewCore {
private native void nativeSetGlobalBounds(int x, int y, int w, int h);
// called by JNI
private void requestListBox(String[] array, boolean[] enabledArray,
private void requestListBox(String[] array, int[] enabledArray,
int[] selectedArray) {
if (mWebView != null) {
mWebView.requestListBox(array, enabledArray, selectedArray);
@@ -2149,7 +2149,7 @@ final class WebViewCore {
}
// called by JNI
private void requestListBox(String[] array, boolean[] enabledArray,
private void requestListBox(String[] array, int[] enabledArray,
int selection) {
if (mWebView != null) {
mWebView.requestListBox(array, enabledArray, selection);

10
core/java/android/widget/CheckedTextView.java
View File

@@ -117,11 +117,11 @@ public class CheckedTextView extends TextView implements Checkable {
* @param d The Drawable to use for the checkmark.
*/
public void setCheckMarkDrawable(Drawable d) {
if (mCheckMarkDrawable != null) {
mCheckMarkDrawable.setCallback(null);
unscheduleDrawable(mCheckMarkDrawable);
}
if (d != null) {
if (mCheckMarkDrawable != null) {
mCheckMarkDrawable.setCallback(null);
unscheduleDrawable(mCheckMarkDrawable);
}
d.setCallback(this);
d.setVisible(getVisibility() == VISIBLE, false);
d.setState(CHECKED_STATE_SET);
@@ -130,10 +130,10 @@ public class CheckedTextView extends TextView implements Checkable {
mCheckMarkWidth = d.getIntrinsicWidth();
mPaddingRight = mCheckMarkWidth + mBasePaddingRight;
d.setState(getDrawableState());
mCheckMarkDrawable = d;
} else {
mPaddingRight = mBasePaddingRight;
}
mCheckMarkDrawable = d;
requestLayout();
}