Merge "No radio buttons on <select>" (59606260) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+14 −17

Original line number	Diff line number	Diff line
		@@ -7768,11 +7768,11 @@ public class WebView extends AbsoluteLayout
		* and allow filtering.
		*/
		private class MyArrayListAdapter extends ArrayAdapter<Container> {
		public MyArrayListAdapter(Context context, Container[] objects, boolean multiple) {
		super(context,
		multiple ? com.android.internal.R.layout.select_dialog_multichoice :
		com.android.internal.R.layout.select_dialog_singlechoice,
		objects);
		public MyArrayListAdapter() {
		super(mContext,
		mMultiple ? com.android.internal.R.layout.select_dialog_multichoice :
		com.android.internal.R.layout.webview_select_singlechoice,
		mContainers);
		}

		@Override
		@@ -7798,13 +7798,12 @@ public class WebView extends AbsoluteLayout
		}

		if (Container.OPTGROUP == c.mEnabled) {
		// Currently select_dialog_multichoice and
		// select_dialog_singlechoice are CheckedTextViews. If
		// that changes, the class cast will no longer be valid.
		Assert.assertTrue(
		convertView instanceof CheckedTextView);
		((CheckedTextView) convertView).setCheckMarkDrawable(
		null);
		// Currently select_dialog_multichoice uses CheckedTextViews.
		// If that changes, the class cast will no longer be valid.
		if (mMultiple) {
		Assert.assertTrue(convertView instanceof CheckedTextView);
		((CheckedTextView) convertView).setCheckMarkDrawable(null);
		}
		} else {
		// c.mEnabled == Container.OPTION_DISABLED
		// Draw the disabled element in a disabled state.
		@@ -7911,6 +7910,7 @@ public class WebView extends AbsoluteLayout
		mAdapter = a;
		}

		@Override
		public void onChanged() {
		// The filter may have changed which item is checked. Find the
		// item that the ListView thinks is checked.
		@@ -7931,15 +7931,12 @@ public class WebView extends AbsoluteLayout
		}
		}
		}

		public void onInvalidate() {}
		}

		public void run() {
		final ListView listView = (ListView) LayoutInflater.from(mContext)
		.inflate(com.android.internal.R.layout.select_dialog, null);
		final MyArrayListAdapter adapter = new
		MyArrayListAdapter(mContext, mContainers, mMultiple);
		final MyArrayListAdapter adapter = new MyArrayListAdapter();
		AlertDialog.Builder b = new AlertDialog.Builder(mContext)
		.setView(listView).setCancelable(true)
		.setInverseBackgroundForced(true);
		@@ -7977,7 +7974,7 @@ public class WebView extends AbsoluteLayout
		}
		} else {
		listView.setOnItemClickListener(new OnItemClickListener() {
		public void onItemClick(AdapterView parent, View v,
		public void onItemClick(AdapterView<?> parent, View v,
		int position, long id) {
		// Rather than sending the message right away, send it
		// after the page regains focus.

core/res/res/layout/webview_select_singlechoice.xml

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2011 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<TextView xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@android:id/text1"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeight"
		android:textAppearance="?android:attr/textAppearanceLarge"
		android:textColor="?android:attr/textColorAlertDialogListItem"
		android:gravity="center_vertical"
		android:paddingLeft="12dip"
		android:paddingRight="7dip"
		android:ellipsize="marquee"
		style="?android:attr/spinnerDropDownItemStyle"
		android:background="?android:attr/activatedBackgroundIndicator"
		/>