[go: nahoru, domu]

Supress wrong constant lint warning in ToolbarActionBar

Bug: 64683509
Test: None
Change-Id: Ib880fcfeb0d9b716392dd29c46cf2ab621ef3f5e
diff --git a/compat/lint-baseline.xml b/compat/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/compat/lint-baseline.xml
+++ b/compat/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/content/lint-baseline.xml b/content/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/content/lint-baseline.xml
+++ b/content/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/core-ui/lint-baseline.xml b/core-ui/lint-baseline.xml
index 1062fea..5869ece 100644
--- a/core-ui/lint-baseline.xml
+++ b/core-ui/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
     <issue
         id="WrongConstant"
diff --git a/core-utils/lint-baseline.xml b/core-utils/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/core-utils/lint-baseline.xml
+++ b/core-utils/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/customtabs/lint-baseline.xml b/customtabs/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/customtabs/lint-baseline.xml
+++ b/customtabs/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/design/lint-baseline.xml b/design/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/design/lint-baseline.xml
+++ b/design/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/dynamic-animation/lint-baseline.xml b/dynamic-animation/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/dynamic-animation/lint-baseline.xml
+++ b/dynamic-animation/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/emoji/appcompat/lint-baseline.xml b/emoji/appcompat/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/emoji/appcompat/lint-baseline.xml
+++ b/emoji/appcompat/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/emoji/bundled/lint-baseline.xml b/emoji/bundled/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/emoji/bundled/lint-baseline.xml
+++ b/emoji/bundled/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/emoji/core/lint-baseline.xml b/emoji/core/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/emoji/core/lint-baseline.xml
+++ b/emoji/core/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/exifinterface/lint-baseline.xml b/exifinterface/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/exifinterface/lint-baseline.xml
+++ b/exifinterface/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/fragment/lint-baseline.xml b/fragment/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/fragment/lint-baseline.xml
+++ b/fragment/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/graphics/drawable/animated/lint-baseline.xml b/graphics/drawable/animated/lint-baseline.xml
index 0668235..eab8464 100644
--- a/graphics/drawable/animated/lint-baseline.xml
+++ b/graphics/drawable/animated/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
     <issue
         id="ResourceType"
diff --git a/graphics/drawable/static/lint-baseline.xml b/graphics/drawable/static/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/graphics/drawable/static/lint-baseline.xml
+++ b/graphics/drawable/static/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/media-compat-test-client/lint-baseline.xml b/media-compat-test-client/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/media-compat-test-client/lint-baseline.xml
+++ b/media-compat-test-client/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/media-compat-test-service/lint-baseline.xml b/media-compat-test-service/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/media-compat-test-service/lint-baseline.xml
+++ b/media-compat-test-service/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/media-compat/lint-baseline.xml b/media-compat/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/media-compat/lint-baseline.xml
+++ b/media-compat/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/percent/lint-baseline.xml b/percent/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/percent/lint-baseline.xml
+++ b/percent/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/recommendation/lint-baseline.xml b/recommendation/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/recommendation/lint-baseline.xml
+++ b/recommendation/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/transition/lint-baseline.xml b/transition/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/transition/lint-baseline.xml
+++ b/transition/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/tv-provider/lint-baseline.xml b/tv-provider/lint-baseline.xml
index 4eaddc8..a572b57 100644
--- a/tv-provider/lint-baseline.xml
+++ b/tv-provider/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
     <issue
         id="WrongConstant"
diff --git a/v13/lint-baseline.xml b/v13/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/v13/lint-baseline.xml
+++ b/v13/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/v14/preference/lint-baseline.xml b/v14/preference/lint-baseline.xml
index 1d140cc..2785493 100644
--- a/v14/preference/lint-baseline.xml
+++ b/v14/preference/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
     <issue
         id="Suspicious0dp"
diff --git a/v17/leanback/lint-baseline.xml b/v17/leanback/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/v17/leanback/lint-baseline.xml
+++ b/v17/leanback/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/v17/preference-leanback/lint-baseline.xml b/v17/preference-leanback/lint-baseline.xml
index 22aaf9d..87addee 100644
--- a/v17/preference-leanback/lint-baseline.xml
+++ b/v17/preference-leanback/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
     <issue
         id="Suspicious0dp"
diff --git a/v4/lint-baseline.xml b/v4/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/v4/lint-baseline.xml
+++ b/v4/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/v7/appcompat/lint-baseline.xml b/v7/appcompat/lint-baseline.xml
index 3ae048f..8bc6f6f 100644
--- a/v7/appcompat/lint-baseline.xml
+++ b/v7/appcompat/lint-baseline.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
-
-    <issue
-        id="WrongConstant"
-        message="Must be one or more of: ActionBar.DISPLAY_USE_LOGO, ActionBar.DISPLAY_SHOW_HOME, ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_CUSTOM"
-        errorLine1="        setDisplayOptions(options, 0xffffffff);"
-        errorLine2="                                   ~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="251"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one or more of: ActionBar.DISPLAY_USE_LOGO, ActionBar.DISPLAY_SHOW_HOME, ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_CUSTOM"
-        errorLine1="        setDisplayOptions(options, 0xffffffff);"
-        errorLine2="                                   ~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="251"
-            column="36"/>
-    </issue>
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java b/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
index a38b12d..473f1b5 100644
--- a/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
+++ b/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
@@ -16,6 +16,7 @@
 
 package android.support.v7.app;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
@@ -246,6 +247,7 @@
         mDecorToolbar.setSubtitle(resId != 0 ? mDecorToolbar.getContext().getText(resId) : null);
     }
 
+    @SuppressLint("WrongConstant")
     @Override
     public void setDisplayOptions(@DisplayOptions int options) {
         setDisplayOptions(options, 0xffffffff);
diff --git a/v7/cardview/lint-baseline.xml b/v7/cardview/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/v7/cardview/lint-baseline.xml
+++ b/v7/cardview/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/v7/gridlayout/lint-baseline.xml b/v7/gridlayout/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/v7/gridlayout/lint-baseline.xml
+++ b/v7/gridlayout/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/v7/mediarouter/lint-baseline.xml b/v7/mediarouter/lint-baseline.xml
index 9ea4e70..b06823b 100644
--- a/v7/mediarouter/lint-baseline.xml
+++ b/v7/mediarouter/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
     <issue
         id="MissingSuperCall"
diff --git a/v7/palette/lint-baseline.xml b/v7/palette/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/v7/palette/lint-baseline.xml
+++ b/v7/palette/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/v7/preference/lint-baseline.xml b/v7/preference/lint-baseline.xml
index 22b46d6..2b0d510 100644
--- a/v7/preference/lint-baseline.xml
+++ b/v7/preference/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
     <issue
         id="Suspicious0dp"
diff --git a/v7/recyclerview/lint-baseline.xml b/v7/recyclerview/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/v7/recyclerview/lint-baseline.xml
+++ b/v7/recyclerview/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>
diff --git a/wear/lint-baseline.xml b/wear/lint-baseline.xml
index e961253..8bc6f6f 100644
--- a/wear/lint-baseline.xml
+++ b/wear/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha7">
+<issues format="4" by="lint 3.0.0-alpha9">
 
 </issues>