diff options
| -rw-r--r-- | core/java/android/webkit/WebView.java | 38 | ||||
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 18 | ||||
| -rw-r--r-- | core/java/android/widget/TabHost.java | 8 |
3 files changed, 27 insertions, 37 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index d9f050b34fe1..8a56081fa9e1 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -5028,15 +5028,13 @@ public class WebView extends AbsoluteLayout super.onAttachedToWindow(); if (hasWindowFocus()) setActive(true); final ViewTreeObserver treeObserver = getViewTreeObserver(); - if (treeObserver != null) { - if (mGlobalLayoutListener == null) { - mGlobalLayoutListener = new InnerGlobalLayoutListener(); - treeObserver.addOnGlobalLayoutListener(mGlobalLayoutListener); - } - if (mScrollChangedListener == null) { - mScrollChangedListener = new InnerScrollChangedListener(); - treeObserver.addOnScrollChangedListener(mScrollChangedListener); - } + if (mGlobalLayoutListener == null) { + mGlobalLayoutListener = new InnerGlobalLayoutListener(); + treeObserver.addOnGlobalLayoutListener(mGlobalLayoutListener); + } + if (mScrollChangedListener == null) { + mScrollChangedListener = new InnerScrollChangedListener(); + treeObserver.addOnScrollChangedListener(mScrollChangedListener); } addAccessibilityApisToJavaScript(); @@ -5049,15 +5047,13 @@ public class WebView extends AbsoluteLayout if (hasWindowFocus()) setActive(false); final ViewTreeObserver treeObserver = getViewTreeObserver(); - if (treeObserver != null) { - if (mGlobalLayoutListener != null) { - treeObserver.removeGlobalOnLayoutListener(mGlobalLayoutListener); - mGlobalLayoutListener = null; - } - if (mScrollChangedListener != null) { - treeObserver.removeOnScrollChangedListener(mScrollChangedListener); - mScrollChangedListener = null; - } + if (mGlobalLayoutListener != null) { + treeObserver.removeGlobalOnLayoutListener(mGlobalLayoutListener); + mGlobalLayoutListener = null; + } + if (mScrollChangedListener != null) { + treeObserver.removeOnScrollChangedListener(mScrollChangedListener); + mScrollChangedListener = null; } removeAccessibilityApisFromJavaScript(); @@ -5091,8 +5087,7 @@ public class WebView extends AbsoluteLayout /** * @deprecated WebView should not have implemented - * ViewTreeObserver.OnGlobalFocusChangeListener. This method - * does nothing now. + * ViewTreeObserver.OnGlobalFocusChangeListener. This method does nothing now. */ @Deprecated public void onGlobalFocusChanged(View oldFocus, View newFocus) { @@ -7725,6 +7720,7 @@ public class WebView extends AbsoluteLayout int mEnabled; int mId; + @Override public String toString() { return mString; } @@ -7878,6 +7874,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. @@ -8193,6 +8190,7 @@ public class WebView extends AbsoluteLayout * zero to make the view transparent. * @param color the ARGB color described by Color.java */ + @Override public void setBackgroundColor(int color) { mBackgroundColor = color; mWebViewCore.sendMessage(EventHub.SET_BACKGROUND_COLOR, color); diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index eb53e56b4b0d..cf7e4d4d18b7 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -2267,11 +2267,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te super.onAttachedToWindow(); final ViewTreeObserver treeObserver = getViewTreeObserver(); - if (treeObserver != null) { - treeObserver.addOnTouchModeChangeListener(this); - if (mTextFilterEnabled && mPopup != null && !mGlobalLayoutListenerAddedFilter) { - treeObserver.addOnGlobalLayoutListener(this); - } + treeObserver.addOnTouchModeChangeListener(this); + if (mTextFilterEnabled && mPopup != null && !mGlobalLayoutListenerAddedFilter) { + treeObserver.addOnGlobalLayoutListener(this); } if (mAdapter != null && mDataSetObserver == null) { @@ -2296,12 +2294,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te mRecycler.clear(); final ViewTreeObserver treeObserver = getViewTreeObserver(); - if (treeObserver != null) { - treeObserver.removeOnTouchModeChangeListener(this); - if (mTextFilterEnabled && mPopup != null) { - treeObserver.removeGlobalOnLayoutListener(this); - mGlobalLayoutListenerAddedFilter = false; - } + treeObserver.removeOnTouchModeChangeListener(this); + if (mTextFilterEnabled && mPopup != null) { + treeObserver.removeGlobalOnLayoutListener(this); + mGlobalLayoutListenerAddedFilter = false; } if (mAdapter != null) { diff --git a/core/java/android/widget/TabHost.java b/core/java/android/widget/TabHost.java index 03eea6676268..57a85311b600 100644 --- a/core/java/android/widget/TabHost.java +++ b/core/java/android/widget/TabHost.java @@ -183,18 +183,14 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); protected void onAttachedToWindow() { super.onAttachedToWindow(); final ViewTreeObserver treeObserver = getViewTreeObserver(); - if (treeObserver != null) { - treeObserver.addOnTouchModeChangeListener(this); - } + treeObserver.addOnTouchModeChangeListener(this); } @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); final ViewTreeObserver treeObserver = getViewTreeObserver(); - if (treeObserver != null) { - treeObserver.removeOnTouchModeChangeListener(this); - } + treeObserver.removeOnTouchModeChangeListener(this); } /** |