Merge "Remove unnecessary @TargetApi annotations"
diff --git a/api/current.txt b/api/current.txt
index 97f96ca..50ba649 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -501,7 +501,6 @@
method public int getScrimColor(android.support.design.widget.CoordinatorLayout, V);
method public float getScrimOpacity(android.support.design.widget.CoordinatorLayout, V);
method public static java.lang.Object getTag(android.view.View);
- method public deprecated boolean isDirty(android.support.design.widget.CoordinatorLayout, V);
method public boolean layoutDependsOn(android.support.design.widget.CoordinatorLayout, V, android.view.View);
method public android.support.v4.view.WindowInsetsCompat onApplyWindowInsets(android.support.design.widget.CoordinatorLayout, V, android.support.v4.view.WindowInsetsCompat);
method public void onAttachedToLayoutParams(android.support.design.widget.CoordinatorLayout.LayoutParams);
diff --git a/core-ui/java/android/support/v4/widget/DrawerLayout.java b/core-ui/java/android/support/v4/widget/DrawerLayout.java
index 7a564bb..f48b036 100644
--- a/core-ui/java/android/support/v4/widget/DrawerLayout.java
+++ b/core-ui/java/android/support/v4/widget/DrawerLayout.java
@@ -453,7 +453,7 @@
/**
* Set a simple drawable used for the left or right shadow. The drawable provided must have a
* nonzero intrinsic width. For API 21 and above, an elevation will be set on the drawer
- * instead of the drawable provided.
+ * instead of using the provided shadow drawable.
*
* <p>Note that for better support for both left-to-right and right-to-left layout
* directions, a drawable for RTL layout (in additional to the one in LTR layout) can be
@@ -492,7 +492,7 @@
/**
* Set a simple drawable used for the left or right shadow. The drawable provided must have a
* nonzero intrinsic width. For API 21 and above, an elevation will be set on the drawer
- * instead of the drawable provided.
+ * instead of using the provided shadow drawable.
*
* <p>Note that for better support for both left-to-right and right-to-left layout
* directions, a drawable for RTL layout (in additional to the one in LTR layout) can be
diff --git a/design/src/android/support/design/widget/CoordinatorLayout.java b/design/src/android/support/design/widget/CoordinatorLayout.java
index adbb0bc..375edcc 100644
--- a/design/src/android/support/design/widget/CoordinatorLayout.java
+++ b/design/src/android/support/design/widget/CoordinatorLayout.java
@@ -2158,15 +2158,6 @@
}
/**
- * @deprecated this method is not called anymore. You can safely remove all usages
- * and implementations. This method will be removed in a future release.
- */
- @Deprecated
- public boolean isDirty(CoordinatorLayout parent, V child) {
- return false;
- }
-
- /**
* Called when the parent CoordinatorLayout is about to measure the given child view.
*
* <p>This method can be used to perform custom or modified measurement of a child view