From 17c50da4be8e754db10b0e2c8714c0d305f031a8 Mon Sep 17 00:00:00 2001 From: Tomasz Mikolajewski Date: Thu, 16 Feb 2017 14:38:04 +0900 Subject: [PATCH] Change EXTRA_QUICK_VIEW_PLAIN to EXTRA_QUICK_VIEW_ADVANCED. Test: Not testable, as the behavior depends on the quick viewer. Bug: 32161075 Change-Id: I46ec36fdce481930096f9ae8ee3c54df792b0233 --- api/current.txt | 4 ++-- api/system-current.txt | 4 ++-- api/test-current.txt | 4 ++-- core/java/android/content/Intent.java | 27 ++++++++++++--------------- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/api/current.txt b/api/current.txt index c8e84c36b3a3b..ac9031c8ea429 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9224,7 +9224,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"; @@ -47338,7 +47338,7 @@ package android.view.textclassifier { public final class TextClassificationManager { method public java.util.List detectLanguages(java.lang.CharSequence); - method public synchronized android.view.textclassifier.TextClassifier getDefaultTextClassifier(); + method public android.view.textclassifier.TextClassifier getDefaultTextClassifier(); } public final class TextClassificationResult { diff --git a/api/system-current.txt b/api/system-current.txt index fd84e838564b2..d3c58a350806f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9668,7 +9668,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"; @@ -50779,7 +50779,7 @@ package android.view.textclassifier { public final class TextClassificationManager { method public java.util.List detectLanguages(java.lang.CharSequence); - method public synchronized android.view.textclassifier.TextClassifier getDefaultTextClassifier(); + method public android.view.textclassifier.TextClassifier getDefaultTextClassifier(); } public final class TextClassificationResult { diff --git a/api/test-current.txt b/api/test-current.txt index 752986ce91d41..6765d627bdf02 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -9250,7 +9250,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"; @@ -47652,7 +47652,7 @@ package android.view.textclassifier { public final class TextClassificationManager { method public java.util.List detectLanguages(java.lang.CharSequence); - method public synchronized android.view.textclassifier.TextClassifier getDefaultTextClassifier(); + method public android.view.textclassifier.TextClassifier getDefaultTextClassifier(); } public final class TextClassificationResult { diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 028a7bcf9539c..b0505ac4a3a2a 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -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. + *

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. *

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. - * - *

Especially, the quick viewer should not let users open the quick viewed files - * in other apps, which includes sharing, opening, editing, printing, etc. - * - *

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. * *

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.