diff options
author | Justin Klaassen <justinklaassen@google.com> | 2018-01-03 13:39:41 -0500 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2018-01-03 13:39:41 -0500 |
commit | 98fe7819c6d14f4f464a5cac047f9e82dee5da58 (patch) | |
tree | a6b8b93eb21e205b27590ab5e2a1fb9efe27f892 /android/view/Surface.java | |
parent | 4217cf85c20565a3446a662a7f07f26137b26b7f (diff) | |
download | android-28-98fe7819c6d14f4f464a5cac047f9e82dee5da58.tar.gz |
Import Android SDK Platform P [4524038]
/google/data/ro/projects/android/fetch_artifact \
--bid 4524038 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4524038.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: Ic193bf1cf0cae78d4f2bfb4fbddfe42025c5c3c2
Diffstat (limited to 'android/view/Surface.java')
-rw-r--r-- | android/view/Surface.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/android/view/Surface.java b/android/view/Surface.java index ddced6cd..a417a4a0 100644 --- a/android/view/Surface.java +++ b/android/view/Surface.java @@ -121,8 +121,12 @@ public class Surface implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({SCALING_MODE_FREEZE, SCALING_MODE_SCALE_TO_WINDOW, - SCALING_MODE_SCALE_CROP, SCALING_MODE_NO_SCALE_CROP}) + @IntDef(prefix = { "SCALING_MODE_" }, value = { + SCALING_MODE_FREEZE, + SCALING_MODE_SCALE_TO_WINDOW, + SCALING_MODE_SCALE_CROP, + SCALING_MODE_NO_SCALE_CROP + }) public @interface ScalingMode {} // From system/window.h /** @hide */ @@ -135,7 +139,12 @@ public class Surface implements Parcelable { public static final int SCALING_MODE_NO_SCALE_CROP = 3; /** @hide */ - @IntDef({ROTATION_0, ROTATION_90, ROTATION_180, ROTATION_270}) + @IntDef(prefix = { "ROTATION_" }, value = { + ROTATION_0, + ROTATION_90, + ROTATION_180, + ROTATION_270 + }) @Retention(RetentionPolicy.SOURCE) public @interface Rotation {} |