Merge "Fix issue #20654534: API Review: android.app.assist" into mnc-dev (fcaed606) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −6

Original line number	Diff line number	Diff line
		@@ -36565,10 +36565,6 @@ package android.view {
		method public static android.animation.Animator createCircularReveal(android.view.View, int, int, float, float);
		}

		public abstract deprecated class ViewAssistStructure extends android.view.ViewStructure {
		ctor public ViewAssistStructure();
		}

		public class ViewConfiguration {
		ctor public deprecated ViewConfiguration();
		method public static android.view.ViewConfiguration get(android.content.Context);
		@@ -36950,7 +36946,7 @@ package android.view {
		ctor public ViewStructure();
		method public abstract int addChildCount(int);
		method public abstract void asyncCommit();
		method public abstract android.view.ViewAssistStructure asyncNewChild(int);
		method public abstract android.view.ViewStructure asyncNewChild(int);
		method public abstract int getChildCount();
		method public abstract android.os.Bundle getExtras();
		method public abstract java.lang.CharSequence getHint();
		@@ -36958,7 +36954,7 @@ package android.view {
		method public abstract int getTextSelectionEnd();
		method public abstract int getTextSelectionStart();
		method public abstract boolean hasExtras();
		method public abstract android.view.ViewAssistStructure newChild(int);
		method public abstract android.view.ViewStructure newChild(int);
		method public abstract void setAccessibilityFocused(boolean);
		method public abstract void setActivated(boolean);
		method public abstract void setCheckable(boolean);

+2 −6

Original line number	Diff line number	Diff line
		@@ -38846,10 +38846,6 @@ package android.view {
		method public static android.animation.Animator createCircularReveal(android.view.View, int, int, float, float);
		}

		public abstract deprecated class ViewAssistStructure extends android.view.ViewStructure {
		ctor public ViewAssistStructure();
		}

		public class ViewConfiguration {
		ctor public deprecated ViewConfiguration();
		method public static android.view.ViewConfiguration get(android.content.Context);
		@@ -39231,7 +39227,7 @@ package android.view {
		ctor public ViewStructure();
		method public abstract int addChildCount(int);
		method public abstract void asyncCommit();
		method public abstract android.view.ViewAssistStructure asyncNewChild(int);
		method public abstract android.view.ViewStructure asyncNewChild(int);
		method public abstract int getChildCount();
		method public abstract android.os.Bundle getExtras();
		method public abstract java.lang.CharSequence getHint();
		@@ -39239,7 +39235,7 @@ package android.view {
		method public abstract int getTextSelectionEnd();
		method public abstract int getTextSelectionStart();
		method public abstract boolean hasExtras();
		method public abstract android.view.ViewAssistStructure newChild(int);
		method public abstract android.view.ViewStructure newChild(int);
		method public abstract void setAccessibilityFocused(boolean);
		method public abstract void setActivated(boolean);
		method public abstract void setCheckable(boolean);

+5 −5

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ import android.os.SystemClock;
		import android.text.TextUtils;
		import android.util.Log;
		import android.view.View;
		import android.view.ViewAssistStructure;
		import android.view.ViewStructure;
		import android.view.ViewRootImpl;
		import android.view.WindowManager;
		import android.view.WindowManagerGlobal;
		@@ -616,7 +616,7 @@ public class AssistStructure implements Parcelable {
		}
		}

		static class ViewNodeBuilder extends ViewAssistStructure {
		static class ViewNodeBuilder extends ViewStructure {
		final AssistStructure mAssist;
		final ViewNode mNode;
		final boolean mAsync;
		@@ -827,14 +827,14 @@ public class AssistStructure implements Parcelable {
		}

		@Override
		public ViewAssistStructure newChild(int index) {
		public ViewStructure newChild(int index) {
		ViewNode node = new ViewNode();
		mNode.mChildren[index] = node;
		return new ViewNodeBuilder(mAssist, node, false);
		}

		@Override
		public ViewAssistStructure asyncNewChild(int index) {
		public ViewStructure asyncNewChild(int index) {
		synchronized (mAssist) {
		ViewNode node = new ViewNode();
		mNode.mChildren[index] = node;
		@@ -849,7 +849,7 @@ public class AssistStructure implements Parcelable {
		synchronized (mAssist) {
		if (!mAsync) {
		throw new IllegalStateException("Child " + this
		+ " was not created with ViewAssistStructure.asyncNewChild");
		+ " was not created with ViewStructure.asyncNewChild");
		}
		if (!mAssist.mPendingAsyncChildren.remove(this)) {
		throw new IllegalStateException("Child " + this + " already committed");

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 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.
		*/

		package android.view;

		/**
		* @deprecated Temporary until old apps can move off this.
		*/
		@Deprecated
		public abstract class ViewAssistStructure extends ViewStructure {
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ public abstract class ViewStructure {
		* children at <var>index</var>.
		* @return Returns an fresh {@link ViewStructure} ready to be filled in.
		*/
		public abstract ViewAssistStructure newChild(int index);
		public abstract ViewStructure newChild(int index);

		/**
		* Like {@link #newChild}, but allows the caller to asynchronously populate the returned
		@@ -231,7 +231,7 @@ public abstract class ViewStructure {
		* population is done.
		* @return Returns an fresh {@link ViewStructure} ready to be filled in.
		*/
		public abstract ViewAssistStructure asyncNewChild(int index);
		public abstract ViewStructure asyncNewChild(int index);

		/**
		* Call when done populating a {@link ViewStructure} returned by