diff options
| author | 2014-03-12 15:19:37 +0000 | |
|---|---|---|
| committer | 2014-03-12 15:19:37 +0000 | |
| commit | 9d50ea90f7072a7fa87d022663f2d25b906ed2ad (patch) | |
| tree | 1fb180f691da87b2f8290a6a78043189eb7444ae | |
| parent | 8d8b1b9cefe9b17b40cf028c7c7533fb6ffb7a51 (diff) | |
| parent | c770e064effb79c33472f54652bd95aa14a8d6ec (diff) | |
am c770e064: am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev
* commit 'c770e064effb79c33472f54652bd95aa14a8d6ec':
Added LEANBACK_LAUNCHER Intent category
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 0030f4117509..9df5c9ee561d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6772,6 +6772,7 @@ package android.content { field public static final java.lang.String CATEGORY_HOME = "android.intent.category.HOME"; field public static final java.lang.String CATEGORY_INFO = "android.intent.category.INFO"; field public static final java.lang.String CATEGORY_LAUNCHER = "android.intent.category.LAUNCHER"; + field public static final java.lang.String CATEGORY_LEANBACK_LAUNCHER = "android.intent.category.LEANBACK_LAUNCHER"; field public static final java.lang.String CATEGORY_LE_DESK_DOCK = "android.intent.category.LE_DESK_DOCK"; field public static final java.lang.String CATEGORY_MONKEY = "android.intent.category.MONKEY"; field public static final java.lang.String CATEGORY_OPENABLE = "android.intent.category.OPENABLE"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index f0b7ca80ea18..96479e266781 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2768,6 +2768,12 @@ public class Intent implements Parcelable, Cloneable { @SdkConstant(SdkConstantType.INTENT_CATEGORY) public static final String CATEGORY_LAUNCHER = "android.intent.category.LAUNCHER"; /** + * Indicates an activity optimized for Leanback mode, and that should + * be displayed in the Leanback launcher. + */ + @SdkConstant(SdkConstantType.INTENT_CATEGORY) + public static final String CATEGORY_LEANBACK_LAUNCHER = "android.intent.category.LEANBACK_LAUNCHER"; + /** * Provides information about the package it is in; typically used if * a package does not contain a {@link #CATEGORY_LAUNCHER} to provide * a front-door to the user without having to be shown in the all apps list. |