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

resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp

Browse Source 
Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea
This commit is contained in:
Jean-Baptiste Queru
2010-10-11 09:38:10 -07:00
parent df08c2f03e e3cfd35bf4
commit e69f1f1a74
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,6 +313,10 @@ public class WebView extends AbsoluteLayout
// true means redraw the screen all-the-time. Only with AUTO_REDRAW_HACK
private boolean mAutoRedraw;
// Reference to the AlertDialog displayed by InvokeListBox.
// It's used to dismiss the dialog in destroy if not done before.
private AlertDialog mListBoxDialog = null;
static final String LOGTAG = "webview";
private static class ExtendedZoomControls extends FrameLayout {
@@ -1296,6 +1300,10 @@ public class WebView extends AbsoluteLayout
*/
public void destroy() {
clearHelpers();
if (mListBoxDialog != null) {
mListBoxDialog.dismiss();
mListBoxDialog = null;
}
if (mWebViewCore != null) {
// Set the handlers to null before destroying WebViewCore so no
// more messages will be posted.
@@ -7509,7 +7517,7 @@ public class WebView extends AbsoluteLayout
EventHub.SINGLE_LISTBOX_CHOICE, -2, 0);
}});
}
final AlertDialog dialog = b.create();
mListBoxDialog = b.create();
listView.setAdapter(adapter);
listView.setFocusableInTouchMode(true);
// There is a bug (1250103) where the checks in a ListView with
@@ -7531,7 +7539,8 @@ public class WebView extends AbsoluteLayout
int position, long id) {
mWebViewCore.sendMessage(
EventHub.SINGLE_LISTBOX_CHOICE, (int)id, 0);
dialog.dismiss();
mListBoxDialog.dismiss();
mListBoxDialog = null;
}
});
if (mSelection != -1) {
@@ -7543,13 +7552,14 @@ public class WebView extends AbsoluteLayout
adapter.registerDataSetObserver(observer);
}
}
dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
mListBoxDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
public void onCancel(DialogInterface dialog) {
mWebViewCore.sendMessage(
EventHub.SINGLE_LISTBOX_CHOICE, -2, 0);
mListBoxDialog = null;
}
});
dialog.show();
mListBoxDialog.show();
}
}