Merge "Add view ID, rework assist API." (31203523) · Commits · e / os / android_frameworks_base

api/current.txt

+17 −5

Original line number	Diff line number	Diff line
		@@ -3977,22 +3977,25 @@ package android.app {
		method public int describeContents();
		method public android.content.ComponentName getActivityComponent();
		method public static android.app.AssistStructure getAssistStructure(android.os.Bundle);
		method public void getWindowAt(int, android.app.AssistStructure.ViewNode);
		method public int getWindowCount();
		method public android.app.AssistStructure.WindowNode getWindowNodeAt(int);
		method public int getWindowNodeCount();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final java.lang.String ASSIST_KEY = "android:assist_structure";
		field public static final android.os.Parcelable.Creator<android.app.AssistStructure> CREATOR;
		}

		public static class AssistStructure.ViewNode {
		ctor public AssistStructure.ViewNode();
		method public void getChildAt(int, android.app.AssistStructure.ViewNode);
		method public android.app.AssistStructure.ViewNode getChildAt(int);
		method public int getChildCount();
		method public java.lang.String getClassName();
		method public java.lang.String getContentDescription();
		method public java.lang.CharSequence getContentDescription();
		method public android.os.Bundle getExtras();
		method public int getHeight();
		method public java.lang.String getHint();
		method public int getId();
		method public java.lang.String getIdEntry();
		method public java.lang.String getIdPackage();
		method public java.lang.String getIdType();
		method public int getLeft();
		method public int getScrollX();
		method public int getScrollY();
		@@ -4023,6 +4026,15 @@ package android.app {
		field public static final int TEXT_STYLE_UNDERLINE = 4; // 0x4
		}

		public static class AssistStructure.WindowNode {
		method public int getHeight();
		method public int getLeft();
		method public android.app.AssistStructure.ViewNode getRootViewNode();
		method public java.lang.CharSequence getTitle();
		method public int getTop();
		method public int getWidth();
		}

		public class DatePickerDialog extends android.app.AlertDialog implements android.widget.DatePicker.OnDateChangedListener android.content.DialogInterface.OnClickListener {
		ctor public DatePickerDialog(android.content.Context, android.app.DatePickerDialog.OnDateSetListener, int, int, int);
		ctor public DatePickerDialog(android.content.Context, int, android.app.DatePickerDialog.OnDateSetListener, int, int, int);

api/system-current.txt

+17 −5

Original line number	Diff line number	Diff line
		@@ -4067,22 +4067,25 @@ package android.app {
		method public int describeContents();
		method public android.content.ComponentName getActivityComponent();
		method public static android.app.AssistStructure getAssistStructure(android.os.Bundle);
		method public void getWindowAt(int, android.app.AssistStructure.ViewNode);
		method public int getWindowCount();
		method public android.app.AssistStructure.WindowNode getWindowNodeAt(int);
		method public int getWindowNodeCount();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final java.lang.String ASSIST_KEY = "android:assist_structure";
		field public static final android.os.Parcelable.Creator<android.app.AssistStructure> CREATOR;
		}

		public static class AssistStructure.ViewNode {
		ctor public AssistStructure.ViewNode();
		method public void getChildAt(int, android.app.AssistStructure.ViewNode);
		method public android.app.AssistStructure.ViewNode getChildAt(int);
		method public int getChildCount();
		method public java.lang.String getClassName();
		method public java.lang.String getContentDescription();
		method public java.lang.CharSequence getContentDescription();
		method public android.os.Bundle getExtras();
		method public int getHeight();
		method public java.lang.String getHint();
		method public int getId();
		method public java.lang.String getIdEntry();
		method public java.lang.String getIdPackage();
		method public java.lang.String getIdType();
		method public int getLeft();
		method public int getScrollX();
		method public int getScrollY();
		@@ -4113,6 +4116,15 @@ package android.app {
		field public static final int TEXT_STYLE_UNDERLINE = 4; // 0x4
		}

		public static class AssistStructure.WindowNode {
		method public int getHeight();
		method public int getLeft();
		method public android.app.AssistStructure.ViewNode getRootViewNode();
		method public java.lang.CharSequence getTitle();
		method public int getTop();
		method public int getWidth();
		}

		public class DatePickerDialog extends android.app.AlertDialog implements android.widget.DatePicker.OnDateChangedListener android.content.DialogInterface.OnClickListener {
		ctor public DatePickerDialog(android.content.Context, android.app.DatePickerDialog.OnDateSetListener, int, int, int);
		ctor public DatePickerDialog(android.content.Context, int, android.app.DatePickerDialog.OnDateSetListener, int, int, int);

core/java/android/app/AssistStructure.java

+212 −93

File changed.

Preview size limit exceeded, changes collapsed.

tests/VoiceInteraction/src/com/android/test/voiceinteraction/AssistVisualizer.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -47,12 +47,12 @@ public class AssistVisualizer extends View {
		public void setAssistStructure(AssistStructure as) {
		mAssistStructure = as;
		mTextRects.clear();
		final int N = as.getWindowCount();
		final int N = as.getWindowNodeCount();
		if (N > 0) {
		AssistStructure.ViewNode window = new AssistStructure.ViewNode();
		for (int i=0; i<N; i++) {
		as.getWindowAt(i, window);
		buildTextRects(window, 0, 0);
		AssistStructure.WindowNode windowNode = as.getWindowNodeAt(i);
		buildTextRects(windowNode.getRootViewNode(), windowNode.getLeft(),
		windowNode.getTop());
		}
		}
		invalidate();
		@@ -79,9 +79,8 @@ public class AssistVisualizer extends View {
		if (N > 0) {
		left -= root.getScrollX();
		top -= root.getScrollY();
		AssistStructure.ViewNode child = new AssistStructure.ViewNode();
		for (int i=0; i<N; i++) {
		root.getChildAt(i, child);
		AssistStructure.ViewNode child = root.getChildAt(i);
		buildTextRects(child, left, top);
		}
		}