From cfa66a2a45c3cec6c338d0d83806fb33d63cfd44 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Fri, 26 Feb 2016 15:29:46 -0800 Subject: DO NOT SUBMIT: Hide VR features for preview. Bug: 26945446 Change-Id: I37e2f9f6ffc65be60bcbef4bdf87da89561ef313 --- api/current.txt | 4 ---- api/system-current.txt | 4 ---- api/test-current.txt | 4 ---- core/java/android/app/Activity.java | 2 ++ core/java/android/content/pm/PackageManager.java | 4 ++++ .../service/notification/NotificationListenerService.java | 12 ++---------- 6 files changed, 8 insertions(+), 22 deletions(-) diff --git a/api/current.txt b/api/current.txt index 95c43b2d9a31..3e5170e71504 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3602,7 +3602,6 @@ package android.app { method public deprecated void setTitleColor(int); method public void setVisible(boolean); method public final void setVolumeControlStream(int); - method public void setVrMode(boolean); method public boolean shouldShowRequestPermissionRationale(java.lang.String); method public boolean shouldUpRecreateTask(android.content.Intent); method public boolean showAssist(android.os.Bundle); @@ -9787,8 +9786,6 @@ package android.content.pm { field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory"; field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host"; field public static final java.lang.String FEATURE_VERIFIED_BOOT = "android.software.verified_boot"; - field public static final java.lang.String FEATURE_VR_MODE = "android.software.vr.mode"; - field public static final java.lang.String FEATURE_VR_MODE_HIGH_PERFORMANCE = "android.hardware.vr.high_performance"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_LEVEL = "android.hardware.vulkan.level"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_VERSION = "android.hardware.vulkan.version"; field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; @@ -34551,7 +34548,6 @@ package android.service.notification { method public static final void requestRebind(android.content.ComponentName) throws android.os.RemoteException; method public final void requestUnbind() throws android.os.RemoteException; method public final void setNotificationsShown(java.lang.String[]); - field public static final java.lang.String CATEGORY_VR_NOTIFICATIONS = "android.intent.category.vr.notifications"; field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1 field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4 field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1 diff --git a/api/system-current.txt b/api/system-current.txt index 47c642f2eb24..f7743a38b5f9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3719,7 +3719,6 @@ package android.app { method public deprecated void setTitleColor(int); method public void setVisible(boolean); method public final void setVolumeControlStream(int); - method public void setVrMode(boolean); method public boolean shouldShowRequestPermissionRationale(java.lang.String); method public boolean shouldUpRecreateTask(android.content.Intent); method public boolean showAssist(android.os.Bundle); @@ -10152,8 +10151,6 @@ package android.content.pm { field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory"; field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host"; field public static final java.lang.String FEATURE_VERIFIED_BOOT = "android.software.verified_boot"; - field public static final java.lang.String FEATURE_VR_MODE = "android.software.vr.mode"; - field public static final java.lang.String FEATURE_VR_MODE_HIGH_PERFORMANCE = "android.hardware.vr.high_performance"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_LEVEL = "android.hardware.vulkan.level"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_VERSION = "android.hardware.vulkan.version"; field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; @@ -37092,7 +37089,6 @@ package android.service.notification { method public final void setNotificationsShown(java.lang.String[]); method public final void setOnNotificationPostedTrim(int); method public void unregisterAsSystemService() throws android.os.RemoteException; - field public static final java.lang.String CATEGORY_VR_NOTIFICATIONS = "android.intent.category.vr.notifications"; field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1 field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4 field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1 diff --git a/api/test-current.txt b/api/test-current.txt index 7a9557c2744f..1a1b452f5b5d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3602,7 +3602,6 @@ package android.app { method public deprecated void setTitleColor(int); method public void setVisible(boolean); method public final void setVolumeControlStream(int); - method public void setVrMode(boolean); method public boolean shouldShowRequestPermissionRationale(java.lang.String); method public boolean shouldUpRecreateTask(android.content.Intent); method public boolean showAssist(android.os.Bundle); @@ -9795,8 +9794,6 @@ package android.content.pm { field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory"; field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host"; field public static final java.lang.String FEATURE_VERIFIED_BOOT = "android.software.verified_boot"; - field public static final java.lang.String FEATURE_VR_MODE = "android.software.vr.mode"; - field public static final java.lang.String FEATURE_VR_MODE_HIGH_PERFORMANCE = "android.hardware.vr.high_performance"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_LEVEL = "android.hardware.vulkan.level"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_VERSION = "android.hardware.vulkan.version"; field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; @@ -34566,7 +34563,6 @@ package android.service.notification { method public static final void requestRebind(android.content.ComponentName) throws android.os.RemoteException; method public final void requestUnbind() throws android.os.RemoteException; method public final void setNotificationsShown(java.lang.String[]); - field public static final java.lang.String CATEGORY_VR_NOTIFICATIONS = "android.intent.category.vr.notifications"; field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1 field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4 field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1 diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 4792dc98c0ee..46b68de30f66 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -6212,6 +6212,8 @@ public class Activity extends ContextThemeWrapper * high-performance stereoscopic rendering.

* * @param enabled {@code true} to enable this mode. + * + * @hide */ public void setVrMode(boolean enabled) { try { diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 4dd8155f1b10..8e5eb2320320 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -2119,6 +2119,8 @@ public abstract class PackageManager { * The device implements a an optimized mode for virtual reality (VR) applications that handles * stereoscopic rendering of notifications, and may potentially also include optimizations to * reduce latency in the graphics, display, and sensor stacks. + * + * @hide */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_VR_MODE = "android.software.vr.mode"; @@ -2132,6 +2134,8 @@ public abstract class PackageManager { * {@link #FEATURE_HIFI_SENSORS} with a low sensor latency, implements an optimized render path * to minimize latency to draw to the device's main display, and includes optimizations to * lower display persistence to an acceptable level. + * + * @hide */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_VR_MODE_HIGH_PERFORMANCE diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index 53c92bf6e7ce..295b281ab76c 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -61,16 +61,6 @@ import java.util.List; * <action android:name="android.service.notification.NotificationListenerService" /> * </intent-filter> * </service> - *

Typically, while enabled in user settings, this service will be bound on boot or when a - * settings change occurs that could affect whether this service should run. However, for some - * system usage modes, the you may instead specify that this service is instead bound and unbound - * in response to mode changes by including a category in the intent filter. Currently - * supported categories are: - *

- *

*/ public abstract class NotificationListenerService extends Service { // TAG = "NotificationListenerService[MySubclass]" @@ -187,6 +177,8 @@ public abstract class NotificationListenerService extends Service { * than the normal lifecycle for a notification service. * * {@see android.app.Activity#setVrMode(boolean)} + * + * @hide */ @SdkConstant(SdkConstant.SdkConstantType.INTENT_CATEGORY) public static final String CATEGORY_VR_NOTIFICATIONS = -- cgit v1.2.3-59-g8ed1b