Merge "Fix a lint warning in SlidingPaneLayout." into oc-mr1-dev
diff --git a/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java b/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
index e3f2462..602df70 100644
--- a/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
+++ b/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
@@ -994,7 +994,7 @@
protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
final LayoutParams lp = (LayoutParams) child.getLayoutParams();
boolean result;
- final int save = canvas.save(Canvas.CLIP_SAVE_FLAG);
+ final int save = canvas.save();
if (mCanSlide && !lp.slideable && mSlideableView != null) {
// Clip against the slider; no sense drawing what will immediately be covered.
diff --git a/core-ui/lint-baseline.xml b/core-ui/lint-baseline.xml
index 8961812..1062fea 100644
--- a/core-ui/lint-baseline.xml
+++ b/core-ui/lint-baseline.xml
@@ -12,15 +12,4 @@
column="47"/>
</issue>
- <issue
- id="WrongConstant"
- message="Must be one or more of: Canvas.ALL_SAVE_FLAG"
- errorLine1=" final int save = canvas.save(Canvas.CLIP_SAVE_FLAG);"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="java/android/support/v4/widget/SlidingPaneLayout.java"
- line="997"
- column="38"/>
- </issue>
-
</issues>