diff options
| author | Andy McFadden <fadden@android.com> | 2014-02-04 00:39:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-04 00:39:16 +0000 |
| commit | 0112757995debe0d4e3527f9f8299380b0561017 (patch) | |
| tree | c7f7ad2f04156df5cdff3e289f3302a1a0c63676 /core/java/android | |
| parent | 6faecbb8d2b9f99d88913a0a7af592e193e8a8ae (diff) | |
| parent | 40b9ef1e2d91615cba6fb5d9527f81090a705026 (diff) | |
| download | frameworks_base-0112757995debe0d4e3527f9f8299380b0561017.zip frameworks_base-0112757995debe0d4e3527f9f8299380b0561017.tar.gz frameworks_base-0112757995debe0d4e3527f9f8299380b0561017.tar.bz2 | |
Merge "Remove setFlags()"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/SurfaceControl.java | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 55dcbb2..97a1f21 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -177,13 +177,13 @@ public class SurfaceControl { * Equivalent to calling hide(). * Updates the value set during Surface creation (see {@link #HIDDEN}). */ - public static final int SURFACE_HIDDEN = 0x01; + private static final int SURFACE_HIDDEN = 0x01; /** * Surface flag: composite without blending when possible. * Updates the value set during Surface creation (see {@link #OPAQUE}). */ - public static final int SURFACE_OPAQUE = 0x02; + private static final int SURFACE_OPAQUE = 0x02; /* built-in physical display ids (keep in sync with ISurfaceComposer.h) @@ -191,13 +191,13 @@ public class SurfaceControl { /** * Built-in physical display id: Main display. - * Use only with {@link SurfaceControl#getBuiltInDisplay()}. + * Use only with {@link SurfaceControl#getBuiltInDisplay(int)}. */ public static final int BUILT_IN_DISPLAY_ID_MAIN = 0; /** * Built-in physical display id: Attached HDMI display. - * Use only with {@link SurfaceControl#getBuiltInDisplay()}. + * Use only with {@link SurfaceControl#getBuiltInDisplay(int)}. */ public static final int BUILT_IN_DISPLAY_ID_HDMI = 1; @@ -369,18 +369,6 @@ public class SurfaceControl { nativeSetMatrix(mNativeObject, dsdx, dtdx, dsdy, dtdy); } - /** - * Sets and clears flags, such as {@link #SURFACE_HIDDEN}. The new value will be: - * <p> - * <code>newFlags = (oldFlags & ~mask) | (flags & mask)</code> - * <p> - * Note this does not take the same set of flags as the constructor. - */ - public void setFlags(int flags, int mask) { - checkNotReleased(); - nativeSetFlags(mNativeObject, flags, mask); - } - public void setWindowCrop(Rect crop) { checkNotReleased(); if (crop != null) { |