diff options
| author | Linus Tufvesson <lus@google.com> | 2020-04-02 13:47:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-02 13:47:14 +0000 |
| commit | 8f258aaee127406985dd980f6b6a12cec649db14 (patch) | |
| tree | 947cd15db757d2b00653dff3b0b508b1a4612516 /core/java/android | |
| parent | 418cefa8a42ef2743c39b0bafaf7e4d471edaae5 (diff) | |
| parent | a9211d687df742350916103f50ace9953c1abf48 (diff) | |
RESTRICT AUTOMERGE am: a9211d687d
Change-Id: I48884c93a30f03f0803ebfe939c2b5cedad70321
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Presentation.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/core/java/android/app/Presentation.java b/core/java/android/app/Presentation.java index b3a39f5025c7..cb72d4d5dc2c 100644 --- a/core/java/android/app/Presentation.java +++ b/core/java/android/app/Presentation.java @@ -26,18 +26,18 @@ import android.content.res.Resources; import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager.DisplayListener; import android.os.Binder; -import android.os.Handler; import android.os.IBinder; -import android.os.Message; -import android.util.DisplayMetrics; -import android.util.Log; -import android.util.TypedValue; import android.view.ContextThemeWrapper; import android.view.Display; import android.view.Gravity; import android.view.Window; import android.view.WindowManager; import android.view.WindowManagerImpl; +import android.os.Handler; +import android.os.Message; +import android.util.DisplayMetrics; +import android.util.Log; +import android.util.TypedValue; /** * Base class for presentations. @@ -116,9 +116,7 @@ import android.view.WindowManagerImpl; * The display manager keeps track of all displays in the system. However, not all * displays are appropriate for showing presentations. For example, if an activity * attempted to show a presentation on the main display it might obscure its own content - * (it's like opening a dialog on top of your activity). Creating a presentation on the main - * display will result in {@link android.view.WindowManager.InvalidDisplayException} being thrown - * when invoking {@link #show()}. + * (it's like opening a dialog on top of your activity). * </p><p> * Here's how to identify suitable displays for showing presentations using * {@link DisplayManager#getDisplays(String)} and the @@ -245,7 +243,7 @@ public class Presentation extends Dialog { /** * Inherited from {@link Dialog#show}. Will throw * {@link android.view.WindowManager.InvalidDisplayException} if the specified secondary - * {@link Display} can't be found or if it does not have {@link Display#FLAG_PRESENTATION} set. + * {@link Display} can't be found. */ @Override public void show() { |