Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b77f9ec9 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "Revert "DO NOT SUBMIT: Hide VR features for preview."" into nyc-dev

parents 8ccb68af e5d76e82

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -3602,6 +3602,7 @@ 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);
@@ -9786,6 +9787,8 @@ 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";
@@ -34552,6 +34555,7 @@ 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

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -3719,6 +3719,7 @@ 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);
@@ -10151,6 +10152,8 @@ 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";
@@ -37095,6 +37098,7 @@ 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

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -3602,6 +3602,7 @@ 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);
@@ -9794,6 +9795,8 @@ 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";
@@ -34567,6 +34570,7 @@ 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

core/java/android/app/Activity.java

+0 −2
Original line number Diff line number Diff line
@@ -6212,8 +6212,6 @@ public class Activity extends ContextThemeWrapper 
     * high-performance stereoscopic rendering.</p>

     *

     * @param enabled {@code true} to enable this mode.

     *

     * @hide

     */

    public void setVrMode(boolean enabled) {

        try {

core/java/android/content/pm/PackageManager.java

+0 −4
Original line number Diff line number Diff line
@@ -2119,8 +2119,6 @@ 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";
@@ -2134,8 +2132,6 @@ 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