Merge "More work on collecting assist data." (484bc6e5) · Commits · e / os / android_frameworks_base

Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -550,6 +550,8 @@ aidl_files := \
		frameworks/base/core/java/android/service/chooser/ChooserTarget.aidl \
		frameworks/base/core/java/android/speech/tts/Voice.aidl \
		frameworks/base/core/java/android/app/usage/UsageEvents.aidl \
		frameworks/base/core/java/android/app/AssistStructure.aidl \
		frameworks/base/core/java/android/app/AssistContent.aidl \
		frameworks/base/core/java/android/app/Notification.aidl \
		frameworks/base/core/java/android/app/WallpaperInfo.aidl \
		frameworks/base/core/java/android/app/AppOpsManager.aidl \

api/current.txt

+37 −12

Original line number	Diff line number	Diff line
		@@ -3429,6 +3429,7 @@ package android.app {
		method public void onPrepareNavigateUpTaskStack(android.app.TaskStackBuilder);
		method public boolean onPrepareOptionsMenu(android.view.Menu);
		method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
		method public void onProvideAssistContent(android.app.AssistContent);
		method public void onProvideAssistData(android.os.Bundle);
		method protected void onRestart();
		method protected void onRestoreInstanceState(android.os.Bundle);
		@@ -3959,20 +3960,33 @@ package android.app {
		field public java.lang.String serviceDetails;
		}

		public final class AssistData implements android.os.Parcelable {
		public class AssistContent implements android.os.Parcelable {
		ctor public AssistContent();
		method public int describeContents();
		method public static android.app.AssistContent getAssistContent(android.os.Bundle);
		method public android.content.ClipData getClipData();
		method public android.content.Intent getIntent();
		method public void setClipData(android.content.ClipData);
		method public void setIntent(android.content.Intent);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final java.lang.String ASSIST_KEY = "android:assist_content";
		field public static final android.os.Parcelable.Creator<android.app.AssistContent> CREATOR;
		}

		public final class AssistStructure implements android.os.Parcelable {
		method public int describeContents();
		method public android.content.ComponentName getActivityComponent();
		method public static android.app.AssistData getAssistData(android.os.Bundle);
		method public void getWindowAt(int, android.app.AssistData.ViewNode);
		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 void writeToParcel(android.os.Parcel, int);
		field public static final java.lang.String ASSIST_KEY = "android:assist";
		field public static final android.os.Parcelable.Creator<android.app.AssistData> CREATOR;
		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 AssistData.ViewNode {
		ctor public AssistData.ViewNode();
		method public void getChildAt(int, android.app.AssistData.ViewNode);
		public static class AssistStructure.ViewNode {
		ctor public AssistStructure.ViewNode();
		method public void getChildAt(int, android.app.AssistStructure.ViewNode);
		method public int getChildCount();
		method public java.lang.String getClassName();
		method public java.lang.String getContentDescription();
		@@ -3982,9 +3996,13 @@ package android.app {
		method public int getLeft();
		method public int getScrollX();
		method public int getScrollY();
		method public java.lang.String getText();
		method public java.lang.CharSequence getText();
		method public int getTextBackgroundColor();
		method public int getTextColor();
		method public int getTextSelectionEnd();
		method public int getTextSelectionStart();
		method public float getTextSize();
		method public int getTextStyle();
		method public int getTop();
		method public int getVisibility();
		method public int getWidth();
		@@ -3998,6 +4016,11 @@ package android.app {
		method public boolean isFocused();
		method public boolean isLongClickable();
		method public boolean isSelected();
		field public static final int TEXT_COLOR_UNDEFINED = 1; // 0x1
		field public static final int TEXT_STYLE_BOLD = 1; // 0x1
		field public static final int TEXT_STYLE_ITALIC = 2; // 0x2
		field public static final int TEXT_STYLE_STRIKE_THRU = 8; // 0x8
		field public static final int TEXT_STYLE_UNDERLINE = 4; // 0x4
		}

		public class DatePickerDialog extends android.app.AlertDialog implements android.widget.DatePicker.OnDateChangedListener android.content.DialogInterface.OnClickListener {
		@@ -7923,6 +7946,7 @@ package android.content {
		field public static final java.lang.String EXTRA_ASSIST_CONTEXT = "android.intent.extra.ASSIST_CONTEXT";
		field public static final java.lang.String EXTRA_ASSIST_INPUT_HINT_KEYBOARD = "android.intent.extra.ASSIST_INPUT_HINT_KEYBOARD";
		field public static final java.lang.String EXTRA_ASSIST_PACKAGE = "android.intent.extra.ASSIST_PACKAGE";
		field public static final java.lang.String EXTRA_ASSIST_UID = "android.intent.extra.ASSIST_UID";
		field public static final java.lang.String EXTRA_BCC = "android.intent.extra.BCC";
		field public static final java.lang.String EXTRA_BUG_REPORT = "android.intent.extra.BUG_REPORT";
		field public static final java.lang.String EXTRA_CC = "android.intent.extra.CC";
		@@ -34305,7 +34329,7 @@ package android.view {
		method protected void onMeasure(int, int);
		method protected void onOverScrolled(int, int, boolean, boolean);
		method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
		method public void onProvideAssistData(android.view.ViewAssistData, android.os.Bundle);
		method public void onProvideAssistStructure(android.view.ViewAssistStructure, android.os.Bundle);
		method protected void onRestoreInstanceState(android.os.Parcelable);
		method public void onRtlPropertiesChanged(int);
		method protected android.os.Parcelable onSaveInstanceState();
		@@ -34709,8 +34733,8 @@ package android.view {
		method public static android.animation.Animator createCircularReveal(android.view.View, int, int, float, float);
		}

		public abstract class ViewAssistData {
		ctor public ViewAssistData();
		public abstract class ViewAssistStructure {
		ctor public ViewAssistStructure();
		method public abstract java.lang.CharSequence getHint();
		method public abstract java.lang.CharSequence getText();
		method public abstract int getTextSelectionEnd();
		@@ -34718,6 +34742,7 @@ package android.view {
		method public abstract void setHint(java.lang.CharSequence);
		method public abstract void setText(java.lang.CharSequence);
		method public abstract void setText(java.lang.CharSequence, int, int);
		method public abstract void setTextPaint(android.text.TextPaint);
		}

		public class ViewConfiguration {

api/system-current.txt

+37 −12

Original line number	Diff line number	Diff line
		@@ -3512,6 +3512,7 @@ package android.app {
		method public void onPrepareNavigateUpTaskStack(android.app.TaskStackBuilder);
		method public boolean onPrepareOptionsMenu(android.view.Menu);
		method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
		method public void onProvideAssistContent(android.app.AssistContent);
		method public void onProvideAssistData(android.os.Bundle);
		method protected void onRestart();
		method protected void onRestoreInstanceState(android.os.Bundle);
		@@ -4049,20 +4050,33 @@ package android.app {
		field public java.lang.String serviceDetails;
		}

		public final class AssistData implements android.os.Parcelable {
		public class AssistContent implements android.os.Parcelable {
		ctor public AssistContent();
		method public int describeContents();
		method public static android.app.AssistContent getAssistContent(android.os.Bundle);
		method public android.content.ClipData getClipData();
		method public android.content.Intent getIntent();
		method public void setClipData(android.content.ClipData);
		method public void setIntent(android.content.Intent);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final java.lang.String ASSIST_KEY = "android:assist_content";
		field public static final android.os.Parcelable.Creator<android.app.AssistContent> CREATOR;
		}

		public final class AssistStructure implements android.os.Parcelable {
		method public int describeContents();
		method public android.content.ComponentName getActivityComponent();
		method public static android.app.AssistData getAssistData(android.os.Bundle);
		method public void getWindowAt(int, android.app.AssistData.ViewNode);
		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 void writeToParcel(android.os.Parcel, int);
		field public static final java.lang.String ASSIST_KEY = "android:assist";
		field public static final android.os.Parcelable.Creator<android.app.AssistData> CREATOR;
		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 AssistData.ViewNode {
		ctor public AssistData.ViewNode();
		method public void getChildAt(int, android.app.AssistData.ViewNode);
		public static class AssistStructure.ViewNode {
		ctor public AssistStructure.ViewNode();
		method public void getChildAt(int, android.app.AssistStructure.ViewNode);
		method public int getChildCount();
		method public java.lang.String getClassName();
		method public java.lang.String getContentDescription();
		@@ -4072,9 +4086,13 @@ package android.app {
		method public int getLeft();
		method public int getScrollX();
		method public int getScrollY();
		method public java.lang.String getText();
		method public java.lang.CharSequence getText();
		method public int getTextBackgroundColor();
		method public int getTextColor();
		method public int getTextSelectionEnd();
		method public int getTextSelectionStart();
		method public float getTextSize();
		method public int getTextStyle();
		method public int getTop();
		method public int getVisibility();
		method public int getWidth();
		@@ -4088,6 +4106,11 @@ package android.app {
		method public boolean isFocused();
		method public boolean isLongClickable();
		method public boolean isSelected();
		field public static final int TEXT_COLOR_UNDEFINED = 1; // 0x1
		field public static final int TEXT_STYLE_BOLD = 1; // 0x1
		field public static final int TEXT_STYLE_ITALIC = 2; // 0x2
		field public static final int TEXT_STYLE_STRIKE_THRU = 8; // 0x8
		field public static final int TEXT_STYLE_UNDERLINE = 4; // 0x4
		}

		public class DatePickerDialog extends android.app.AlertDialog implements android.widget.DatePicker.OnDateChangedListener android.content.DialogInterface.OnClickListener {
		@@ -8137,6 +8160,7 @@ package android.content {
		field public static final java.lang.String EXTRA_ASSIST_CONTEXT = "android.intent.extra.ASSIST_CONTEXT";
		field public static final java.lang.String EXTRA_ASSIST_INPUT_HINT_KEYBOARD = "android.intent.extra.ASSIST_INPUT_HINT_KEYBOARD";
		field public static final java.lang.String EXTRA_ASSIST_PACKAGE = "android.intent.extra.ASSIST_PACKAGE";
		field public static final java.lang.String EXTRA_ASSIST_UID = "android.intent.extra.ASSIST_UID";
		field public static final java.lang.String EXTRA_BCC = "android.intent.extra.BCC";
		field public static final java.lang.String EXTRA_BUG_REPORT = "android.intent.extra.BUG_REPORT";
		field public static final java.lang.String EXTRA_CC = "android.intent.extra.CC";
		@@ -36473,7 +36497,7 @@ package android.view {
		method protected void onMeasure(int, int);
		method protected void onOverScrolled(int, int, boolean, boolean);
		method public void onPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
		method public void onProvideAssistData(android.view.ViewAssistData, android.os.Bundle);
		method public void onProvideAssistStructure(android.view.ViewAssistStructure, android.os.Bundle);
		method protected void onRestoreInstanceState(android.os.Parcelable);
		method public void onRtlPropertiesChanged(int);
		method protected android.os.Parcelable onSaveInstanceState();
		@@ -36877,8 +36901,8 @@ package android.view {
		method public static android.animation.Animator createCircularReveal(android.view.View, int, int, float, float);
		}

		public abstract class ViewAssistData {
		ctor public ViewAssistData();
		public abstract class ViewAssistStructure {
		ctor public ViewAssistStructure();
		method public abstract java.lang.CharSequence getHint();
		method public abstract java.lang.CharSequence getText();
		method public abstract int getTextSelectionEnd();
		@@ -36886,6 +36910,7 @@ package android.view {
		method public abstract void setHint(java.lang.CharSequence);
		method public abstract void setText(java.lang.CharSequence);
		method public abstract void setText(java.lang.CharSequence, int, int);
		method public abstract void setTextPaint(android.text.TextPaint);
		}

		public class ViewConfiguration {

core/java/android/app/Activity.java

+23 −5

Original line number	Diff line number	Diff line
		@@ -1548,17 +1548,35 @@ public class Activity extends ContextThemeWrapper
		* {@link Intent#ACTION_ASSIST} Intent with all of the context of the current
		* application. You can override this method to place into the bundle anything
		* you would like to appear in the {@link Intent#EXTRA_ASSIST_CONTEXT} part
		* of the assist Intent. The default implementation automatically generates a
		* {@link AssistData} from your activity and places it in to the Bundle; if you
		* don't want your UI reported to the assistant, don't call this default
		* implementation.
		* of the assist Intent.
		*
		* <p>This function will be called after any global assist callbacks that had
		* been registered with {@link Application#registerOnProvideAssistDataListener
		* Application.registerOnProvideAssistDataListener}.
		*/
		public void onProvideAssistData(Bundle data) {
		data.putParcelable(AssistData.ASSIST_KEY, new AssistData(this));
		}

		/**
		* This is called when the user is requesting an assist, to provide references
		* to content related to the current activity. Before being called, the
		* {@code outContent} Intent is filled with the base Intent of the activity (the Intent
		* returned by {@link #getIntent()}). The Intent's extras are stripped of any types
		* that are not valid for {@link PersistableBundle} or non-framework Parcelables, and
		* the flags {@link Intent#FLAG_GRANT_WRITE_URI_PERMISSION} and
		* {@link Intent#FLAG_GRANT_PERSISTABLE_URI_PERMISSION} are cleared from the Intent.
		*
		* <p>Custom implementation may adjust the content intent to better reflect the top-level
		* context of the activity, and fill in its ClipData with additional content of
		* interest that the user is currently viewing. For example, an image gallery application
		* that has launched in to an activity allowing the user to swipe through pictures should
		* modify the intent to reference the current image they are looking it; such an
		* application when showing a list of pictures should add a ClipData that has
		* references to all of the pictures currently visible on screen.</p>
		*
		* @param outContent The assist content to return.
		*/
		public void onProvideAssistContent(AssistContent outContent) {
		}

		/**

core/java/android/app/ActivityManager.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -309,6 +309,12 @@ public class ActivityManager {
		/** @hide Process is being cached for later use and is empty. */
		public static final int PROCESS_STATE_CACHED_EMPTY = 13;

		/** @hide requestType for assist context: only basic information. */
		public static final int ASSIST_CONTEXT_BASIC = 0;

		/** @hide requestType for assist context: generate full AssistStructure. */
		public static final int ASSIST_CONTEXT_FULL = 1;

		/**
		* Lock task mode is not active.
		*/