diff options
| -rw-r--r-- | api/16.txt | 20 | ||||
| -rw-r--r-- | api/current.txt | 20 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 20 | 
3 files changed, 30 insertions, 30 deletions
diff --git a/api/16.txt b/api/16.txt index 6070f38538ff..6b41477d89b9 100644 --- a/api/16.txt +++ b/api/16.txt @@ -23165,7 +23165,7 @@ package android.view {      method protected boolean verifyDrawable(android.graphics.drawable.Drawable);      method public boolean willNotCacheDrawing();      method public boolean willNotDraw(); -    field public static android.util.Property ALPHA; +    field public static final android.util.Property ALPHA;      field public static final int DRAWING_CACHE_QUALITY_AUTO = 0; // 0x0      field public static final int DRAWING_CACHE_QUALITY_HIGH = 1048576; // 0x100000      field public static final int DRAWING_CACHE_QUALITY_LOW = 524288; // 0x80000 @@ -23222,11 +23222,11 @@ package android.view {      field protected static final int[] PRESSED_SELECTED_STATE_SET;      field protected static final int[] PRESSED_SELECTED_WINDOW_FOCUSED_STATE_SET;      field protected static final int[] PRESSED_WINDOW_FOCUSED_STATE_SET; -    field public static android.util.Property ROTATION; -    field public static android.util.Property ROTATION_X; -    field public static android.util.Property ROTATION_Y; -    field public static android.util.Property SCALE_X; -    field public static android.util.Property SCALE_Y; +    field public static final android.util.Property ROTATION; +    field public static final android.util.Property ROTATION_X; +    field public static final android.util.Property ROTATION_Y; +    field public static final android.util.Property SCALE_X; +    field public static final android.util.Property SCALE_Y;      field public static final int SCROLLBARS_INSIDE_INSET = 16777216; // 0x1000000      field public static final int SCROLLBARS_INSIDE_OVERLAY = 0; // 0x0      field public static final int SCROLLBARS_OUTSIDE_INSET = 50331648; // 0x3000000 @@ -23242,13 +23242,13 @@ package android.view {      field public static final int SYSTEM_UI_FLAG_HIDE_NAVIGATION = 2; // 0x2      field public static final int SYSTEM_UI_FLAG_LOW_PROFILE = 1; // 0x1      field public static final int SYSTEM_UI_FLAG_VISIBLE = 0; // 0x0 -    field public static android.util.Property TRANSLATION_X; -    field public static android.util.Property TRANSLATION_Y; +    field public static final android.util.Property TRANSLATION_X; +    field public static final android.util.Property TRANSLATION_Y;      field protected static final java.lang.String VIEW_LOG_TAG = "View";      field public static final int VISIBLE = 0; // 0x0      field protected static final int[] WINDOW_FOCUSED_STATE_SET; -    field public static android.util.Property X; -    field public static android.util.Property Y; +    field public static final android.util.Property X; +    field public static final android.util.Property Y;    }    public static class View.AccessibilityDelegate { diff --git a/api/current.txt b/api/current.txt index d0ca33e93edb..b2f20c72a577 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23316,7 +23316,7 @@ package android.view {      method protected boolean verifyDrawable(android.graphics.drawable.Drawable);      method public boolean willNotCacheDrawing();      method public boolean willNotDraw(); -    field public static android.util.Property ALPHA; +    field public static final android.util.Property ALPHA;      field public static final int DRAWING_CACHE_QUALITY_AUTO = 0; // 0x0      field public static final int DRAWING_CACHE_QUALITY_HIGH = 1048576; // 0x100000      field public static final int DRAWING_CACHE_QUALITY_LOW = 524288; // 0x80000 @@ -23373,11 +23373,11 @@ package android.view {      field protected static final int[] PRESSED_SELECTED_STATE_SET;      field protected static final int[] PRESSED_SELECTED_WINDOW_FOCUSED_STATE_SET;      field protected static final int[] PRESSED_WINDOW_FOCUSED_STATE_SET; -    field public static android.util.Property ROTATION; -    field public static android.util.Property ROTATION_X; -    field public static android.util.Property ROTATION_Y; -    field public static android.util.Property SCALE_X; -    field public static android.util.Property SCALE_Y; +    field public static final android.util.Property ROTATION; +    field public static final android.util.Property ROTATION_X; +    field public static final android.util.Property ROTATION_Y; +    field public static final android.util.Property SCALE_X; +    field public static final android.util.Property SCALE_Y;      field public static final int SCROLLBARS_INSIDE_INSET = 16777216; // 0x1000000      field public static final int SCROLLBARS_INSIDE_OVERLAY = 0; // 0x0      field public static final int SCROLLBARS_OUTSIDE_INSET = 50331648; // 0x3000000 @@ -23393,13 +23393,13 @@ package android.view {      field public static final int SYSTEM_UI_FLAG_HIDE_NAVIGATION = 2; // 0x2      field public static final int SYSTEM_UI_FLAG_LOW_PROFILE = 1; // 0x1      field public static final int SYSTEM_UI_FLAG_VISIBLE = 0; // 0x0 -    field public static android.util.Property TRANSLATION_X; -    field public static android.util.Property TRANSLATION_Y; +    field public static final android.util.Property TRANSLATION_X; +    field public static final android.util.Property TRANSLATION_Y;      field protected static final java.lang.String VIEW_LOG_TAG = "View";      field public static final int VISIBLE = 0; // 0x0      field protected static final int[] WINDOW_FOCUSED_STATE_SET; -    field public static android.util.Property X; -    field public static android.util.Property Y; +    field public static final android.util.Property X; +    field public static final android.util.Property Y;    }    public static class View.AccessibilityDelegate { diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 5c93a4297f94..de3f00f2aa82 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -13871,7 +13871,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal       * A Property wrapper around the <code>alpha</code> functionality handled by the       * {@link View#setAlpha(float)} and {@link View#getAlpha()} methods.       */ -    public static Property<View, Float> ALPHA = new FloatProperty<View>("alpha") { +    public static final Property<View, Float> ALPHA = new FloatProperty<View>("alpha") {          @Override          public void setValue(View object, float value) {              object.setAlpha(value); @@ -13887,7 +13887,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal       * A Property wrapper around the <code>translationX</code> functionality handled by the       * {@link View#setTranslationX(float)} and {@link View#getTranslationX()} methods.       */ -    public static Property<View, Float> TRANSLATION_X = new FloatProperty<View>("translationX") { +    public static final Property<View, Float> TRANSLATION_X = new FloatProperty<View>("translationX") {          @Override          public void setValue(View object, float value) {              object.setTranslationX(value); @@ -13903,7 +13903,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal       * A Property wrapper around the <code>translationY</code> functionality handled by the       * {@link View#setTranslationY(float)} and {@link View#getTranslationY()} methods.       */ -    public static Property<View, Float> TRANSLATION_Y = new FloatProperty<View>("translationY") { +    public static final Property<View, Float> TRANSLATION_Y = new FloatProperty<View>("translationY") {          @Override          public void setValue(View object, float value) {              object.setTranslationY(value); @@ -13919,7 +13919,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal       * A Property wrapper around the <code>x</code> functionality handled by the       * {@link View#setX(float)} and {@link View#getX()} methods.       */ -    public static Property<View, Float> X = new FloatProperty<View>("x") { +    public static final Property<View, Float> X = new FloatProperty<View>("x") {          @Override          public void setValue(View object, float value) {              object.setX(value); @@ -13935,7 +13935,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal       * A Property wrapper around the <code>y</code> functionality handled by the       * {@link View#setY(float)} and {@link View#getY()} methods.       */ -    public static Property<View, Float> Y = new FloatProperty<View>("y") { +    public static final Property<View, Float> Y = new FloatProperty<View>("y") {          @Override          public void setValue(View object, float value) {              object.setY(value); @@ -13951,7 +13951,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal       * A Property wrapper around the <code>rotation</code> functionality handled by the       * {@link View#setRotation(float)} and {@link View#getRotation()} methods.       */ -    public static Property<View, Float> ROTATION = new FloatProperty<View>("rotation") { +    public static final Property<View, Float> ROTATION = new FloatProperty<View>("rotation") {          @Override          public void setValue(View object, float value) {              object.setRotation(value); @@ -13967,7 +13967,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal       * A Property wrapper around the <code>rotationX</code> functionality handled by the       * {@link View#setRotationX(float)} and {@link View#getRotationX()} methods.       */ -    public static Property<View, Float> ROTATION_X = new FloatProperty<View>("rotationX") { +    public static final Property<View, Float> ROTATION_X = new FloatProperty<View>("rotationX") {          @Override          public void setValue(View object, float value) {              object.setRotationX(value); @@ -13983,7 +13983,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal       * A Property wrapper around the <code>rotationY</code> functionality handled by the       * {@link View#setRotationY(float)} and {@link View#getRotationY()} methods.       */ -    public static Property<View, Float> ROTATION_Y = new FloatProperty<View>("rotationY") { +    public static final Property<View, Float> ROTATION_Y = new FloatProperty<View>("rotationY") {          @Override          public void setValue(View object, float value) {              object.setRotationY(value); @@ -13999,7 +13999,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal       * A Property wrapper around the <code>scaleX</code> functionality handled by the       * {@link View#setScaleX(float)} and {@link View#getScaleX()} methods.       */ -    public static Property<View, Float> SCALE_X = new FloatProperty<View>("scaleX") { +    public static final Property<View, Float> SCALE_X = new FloatProperty<View>("scaleX") {          @Override          public void setValue(View object, float value) {              object.setScaleX(value); @@ -14015,7 +14015,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal       * A Property wrapper around the <code>scaleY</code> functionality handled by the       * {@link View#setScaleY(float)} and {@link View#getScaleY()} methods.       */ -    public static Property<View, Float> SCALE_Y = new FloatProperty<View>("scaleY") { +    public static final Property<View, Float> SCALE_Y = new FloatProperty<View>("scaleY") {          @Override          public void setValue(View object, float value) {              object.setScaleY(value);  |