Merge "Removed ViewTreeObserver null checks" (5bf7658c) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+17 −20

Original line number	Diff line number	Diff line
		@@ -5043,7 +5043,6 @@ 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);
		@@ -5052,7 +5051,6 @@ public class WebView extends AbsoluteLayout
		mScrollChangedListener = new InnerScrollChangedListener();
		treeObserver.addOnScrollChangedListener(mScrollChangedListener);
		}
		}

		addAccessibilityApisToJavaScript();
		}
		@@ -5064,7 +5062,6 @@ public class WebView extends AbsoluteLayout
		if (hasWindowFocus()) setActive(false);

		final ViewTreeObserver treeObserver = getViewTreeObserver();
		if (treeObserver != null) {
		if (mGlobalLayoutListener != null) {
		treeObserver.removeGlobalOnLayoutListener(mGlobalLayoutListener);
		mGlobalLayoutListener = null;
		@@ -5073,7 +5070,6 @@ public class WebView extends AbsoluteLayout
		treeObserver.removeOnScrollChangedListener(mScrollChangedListener);
		mScrollChangedListener = null;
		}
		}

		removeAccessibilityApisFromJavaScript();

		@@ -5106,8 +5102,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) {
		@@ -7758,6 +7753,7 @@ public class WebView extends AbsoluteLayout
		int mEnabled;
		int mId;

		@Override
		public String toString() {
		return mString;
		}
		@@ -8222,6 +8218,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);

core/java/android/widget/AbsListView.java

+7 −11

Original line number	Diff line number	Diff line
		@@ -2268,12 +2268,10 @@ 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);
		}
		}

		if (mAdapter != null && mDataSetObserver == null) {
		mDataSetObserver = new AdapterDataSetObserver();
		@@ -2297,13 +2295,11 @@ 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;
		}
		}

		if (mAdapter != null) {
		mAdapter.unregisterDataSetObserver(mDataSetObserver);

core/java/android/widget/TabHost.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -183,19 +183,15 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();
		final ViewTreeObserver treeObserver = getViewTreeObserver();
		if (treeObserver != null) {
		treeObserver.addOnTouchModeChangeListener(this);
		}
		}

		@Override
		protected void onDetachedFromWindow() {
		super.onDetachedFromWindow();
		final ViewTreeObserver treeObserver = getViewTreeObserver();
		if (treeObserver != null) {
		treeObserver.removeOnTouchModeChangeListener(this);
		}
		}

		/**
		* {@inheritDoc}