Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change EXTRA_QUICK_VIEW_PLAIN to EXTRA_QUICK_VIEW_ADVANCED."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-16 12:54:50 +00:00
committed by Android (Google) Code Review
parent b3003af0f6 17c50da4be
commit cc5b6a4347
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -9226,7 +9226,7 @@ package android.content {
field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
field public static final java.lang.String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT";
field public static final java.lang.String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";
field public static final java.lang.String EXTRA_QUICK_VIEW_PLAIN = "android.intent.extra.QUICK_VIEW_PLAIN";
field public static final java.lang.String EXTRA_QUICK_VIEW_ADVANCED = "android.intent.extra.QUICK_VIEW_ADVANCED";
field public static final java.lang.String EXTRA_QUIET_MODE = "android.intent.extra.QUIET_MODE";
field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";
field public static final java.lang.String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";
@@ -47340,7 +47340,7 @@ package android.view.textclassifier {
public final class TextClassificationManager {
method public java.util.List<android.view.textclassifier.TextLanguage> detectLanguages(java.lang.CharSequence);
method public synchronized android.view.textclassifier.TextClassifier getDefaultTextClassifier();
method public android.view.textclassifier.TextClassifier getDefaultTextClassifier();
}
public final class TextClassificationResult {

4
api/system-current.txt
View File

@@ -9670,7 +9670,7 @@ package android.content {
field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
field public static final java.lang.String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT";
field public static final java.lang.String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";
field public static final java.lang.String EXTRA_QUICK_VIEW_PLAIN = "android.intent.extra.QUICK_VIEW_PLAIN";
field public static final java.lang.String EXTRA_QUICK_VIEW_ADVANCED = "android.intent.extra.QUICK_VIEW_ADVANCED";
field public static final java.lang.String EXTRA_QUIET_MODE = "android.intent.extra.QUIET_MODE";
field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";
field public static final java.lang.String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";
@@ -50781,7 +50781,7 @@ package android.view.textclassifier {
public final class TextClassificationManager {
method public java.util.List<android.view.textclassifier.TextLanguage> detectLanguages(java.lang.CharSequence);
method public synchronized android.view.textclassifier.TextClassifier getDefaultTextClassifier();
method public android.view.textclassifier.TextClassifier getDefaultTextClassifier();
}
public final class TextClassificationResult {

4
api/test-current.txt
View File

@@ -9252,7 +9252,7 @@ package android.content {
field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
field public static final java.lang.String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT";
field public static final java.lang.String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";
field public static final java.lang.String EXTRA_QUICK_VIEW_PLAIN = "android.intent.extra.QUICK_VIEW_PLAIN";
field public static final java.lang.String EXTRA_QUICK_VIEW_ADVANCED = "android.intent.extra.QUICK_VIEW_ADVANCED";
field public static final java.lang.String EXTRA_QUIET_MODE = "android.intent.extra.QUIET_MODE";
field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";
field public static final java.lang.String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";
@@ -47654,7 +47654,7 @@ package android.view.textclassifier {
public final class TextClassificationManager {
method public java.util.List<android.view.textclassifier.TextLanguage> detectLanguages(java.lang.CharSequence);
method public synchronized android.view.textclassifier.TextClassifier getDefaultTextClassifier();
method public android.view.textclassifier.TextClassifier getDefaultTextClassifier();
}
public final class TextClassificationResult {

27
core/java/android/content/Intent.java
View File

@@ -669,13 +669,14 @@ public class Intent implements Parcelable, Cloneable {
* preview. {@link #getClipData} contains an optional list of content URIs
* if there is more than one item to preview. {@link #EXTRA_INDEX} is an
* optional index of the URI in the clip data to show first.
* If {@link #EXTRA_QUICK_VIEW_PLAIN} is true, then the quick viewer should show
* basic UI without any extra features other than quick viewing the passed items.
* Especially, the quick viewer should not let users open the passed files
* in other apps, which includes sharing, opening, editing, printing, etc in the
* plain mode.
* <p>By default quick viewers are supposed to be lightweight and focus on
* previewing the content only. They should not expose features such as printing,
* opening in an external app, deleting, rotating, casting, etc.
* However, if {@link #EXTRA_QUICK_VIEW_ADVANCED} is true, then the quick viewer
* may show advanced UI which includes convenience actions suitable for the passed
* Uris.
* <p>Output: nothing.
* @see #EXTRA_QUICK_VIEW_HIDE_DEFAULT_ACTIONS
* @see #EXTRA_QUICK_VIEW_ADVANCED
* @see #EXTRA_INDEX
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
@@ -4413,19 +4414,15 @@ public class Intent implements Parcelable, Cloneable {
public static final String EXTRA_INDEX = "android.intent.extra.INDEX";
/**
* Shows a plain quick viewer UI which doesn't provide any extra features other than
* quick viewing the items.
*
* <p>Especially, the quick viewer should not let users open the quick viewed files
* in other apps, which includes sharing, opening, editing, printing, etc.
*
* <p>This feature is optional, and may not be handled by all quick viewers.
* Tells the quick viewer to show additional UI actions suitable for the passed Uris,
* such as opening in other apps, sharing, opening, editing, printing, deleting,
* casting, etc.
*
* <p>The value is boolean. By default false.
* @see ACTION_QUICK_VIEW
*/
public static final String EXTRA_QUICK_VIEW_PLAIN =
"android.intent.extra.QUICK_VIEW_PLAIN";
public static final String EXTRA_QUICK_VIEW_ADVANCED =
"android.intent.extra.QUICK_VIEW_ADVANCED";
/**
* Optional boolean extra indicating whether quiet mode has been switched on or off.