Merge "Fix constants to be unique"

Romain Guy · Android (Google) Code Review · commit 1fc18056eb87 · 2012-03-26T17:15:57.000-07:00
diff --git a/core/java/android/view/DisplayList.java b/core/java/android/view/DisplayList.java
@@ -49,7 +49,7 @@ public abstract class DisplayList {
      * 
      * @see HardwareCanvas#drawDisplayList(DisplayList, int, int, android.graphics.Rect, int)
      */
-    public static final int STATUS_DRAW = 0x2;
+    public static final int STATUS_DRAW = 0x1;
 
     /**
      * Indicates that the display list needs to re-execute its GL functors.

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public abstract class DisplayList {`
`49`	`49`	`*`
`50`	`50`	`* @see HardwareCanvas#drawDisplayList(DisplayList, int, int, android.graphics.Rect, int)`
`51`	`51`	`*/`
`52`		`- public static final int STATUS_DRAW = 0x2;`
	`52`	`+ public static final int STATUS_DRAW = 0x1;`
`53`	`53`
`54`	`54`	`/**`
`55`	`55`	`* Indicates that the display list needs to re-execute its GL functors.`