am 9ed30f93: Merge change I96444af2 into eclair
Merge commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84' into eclair-plus-aosp
* commit '9ed30f93f6149ede5885b9b8c0e22595876c6c84':
Unhide View.isOpaque().
diff --git a/api/current.xml b/api/current.xml
index e9d6206..3abd38b 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -158108,6 +158108,17 @@
visibility="public"
>
</method>
+<method name="isOpaque"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="isPaddingOffsetRequired"
return="boolean"
abstract="false"
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index eb3e523..ef306fe 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -4956,8 +4956,6 @@
* invalidate/draw passes.
*
* @return True if this View is guaranteed to be fully opaque, false otherwise.
- *
- * @hide Pending API council approval
*/
@ViewDebug.ExportedProperty
public boolean isOpaque() {