Commit 22c3f945 authored by newt's avatar newt Committed by Commit bot

Address NewApi Android lint warnings in src/content.

Annotate several classes with @TargetApi so lint knows that those
classes can safely use methods introduced in various versions of
Android.

BUG=266140

Review URL: https://codereview.chromium.org/963383002

Cr-Commit-Position: refs/heads/master@{#318751}
parent a73f18d9
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
package org.chromium.content.browser; package org.chromium.content.browser;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.app.SearchManager; import android.app.SearchManager;
import android.content.ClipboardManager; import android.content.ClipboardManager;
...@@ -2806,6 +2807,7 @@ public class ContentViewCore ...@@ -2806,6 +2807,7 @@ public class ContentViewCore
/** /**
* @see View#onInitializeAccessibilityEvent(AccessibilityEvent) * @see View#onInitializeAccessibilityEvent(AccessibilityEvent)
*/ */
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
public void onInitializeAccessibilityEvent(AccessibilityEvent event) { public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
// Note: this is only used by the script-injecting accessibility code. // Note: this is only used by the script-injecting accessibility code.
event.setClassName(this.getClass().getName()); event.setClassName(this.getClass().getName());
...@@ -2820,9 +2822,7 @@ public class ContentViewCore ...@@ -2820,9 +2822,7 @@ public class ContentViewCore
int maxScrollYPix = Math.max(0, mRenderCoordinates.getMaxVerticalScrollPixInt()); int maxScrollYPix = Math.max(0, mRenderCoordinates.getMaxVerticalScrollPixInt());
event.setScrollable(maxScrollXPix > 0 || maxScrollYPix > 0); event.setScrollable(maxScrollXPix > 0 || maxScrollYPix > 0);
// Setting the maximum scroll values requires API level 15 or higher. if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
final int sdkVersionRequiredToSetScroll = 15;
if (Build.VERSION.SDK_INT >= sdkVersionRequiredToSetScroll) {
event.setMaxScrollX(maxScrollXPix); event.setMaxScrollX(maxScrollXPix);
event.setMaxScrollY(maxScrollYPix); event.setMaxScrollY(maxScrollYPix);
} }
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
package org.chromium.content.browser.accessibility; package org.chromium.content.browser.accessibility;
import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.Build; import android.os.Build;
...@@ -38,6 +39,7 @@ import java.util.Locale; ...@@ -38,6 +39,7 @@ import java.util.Locale;
* accessibility. * accessibility.
*/ */
@JNINamespace("content") @JNINamespace("content")
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
public class BrowserAccessibilityManager { public class BrowserAccessibilityManager {
private static final String TAG = "BrowserAccessibilityManager"; private static final String TAG = "BrowserAccessibilityManager";
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
package org.chromium.content.browser.accessibility; package org.chromium.content.browser.accessibility;
import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemClock; import android.os.SystemClock;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
...@@ -22,6 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; ...@@ -22,6 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* Handles injecting accessibility Javascript and related Javascript -> Java APIs for JB and newer * Handles injecting accessibility Javascript and related Javascript -> Java APIs for JB and newer
* devices. * devices.
*/ */
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
class JellyBeanAccessibilityInjector extends AccessibilityInjector { class JellyBeanAccessibilityInjector extends AccessibilityInjector {
private CallbackHandler mCallback; private CallbackHandler mCallback;
private JSONObject mAccessibilityJSONObject; private JSONObject mAccessibilityJSONObject;
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
package org.chromium.content.browser.accessibility; package org.chromium.content.browser.accessibility;
import android.annotation.TargetApi;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeProvider; import android.view.accessibility.AccessibilityNodeProvider;
...@@ -18,6 +20,7 @@ import java.util.List; ...@@ -18,6 +20,7 @@ import java.util.List;
* AccessibilityNodeProvider and delegates its implementation to this object. * AccessibilityNodeProvider and delegates its implementation to this object.
*/ */
@JNINamespace("content") @JNINamespace("content")
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
public class JellyBeanBrowserAccessibilityManager extends BrowserAccessibilityManager { public class JellyBeanBrowserAccessibilityManager extends BrowserAccessibilityManager {
private AccessibilityNodeProvider mAccessibilityNodeProvider; private AccessibilityNodeProvider mAccessibilityNodeProvider;
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
package org.chromium.content.browser.accessibility; package org.chromium.content.browser.accessibility;
import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
...@@ -20,6 +22,7 @@ import java.util.Iterator; ...@@ -20,6 +22,7 @@ import java.util.Iterator;
* Handles injecting accessibility Javascript and related Javascript -> Java APIs for Lollipop and * Handles injecting accessibility Javascript and related Javascript -> Java APIs for Lollipop and
* newer devices. * newer devices.
*/ */
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
class LollipopAccessibilityInjector extends JellyBeanAccessibilityInjector { class LollipopAccessibilityInjector extends JellyBeanAccessibilityInjector {
/** /**
* Constructs an instance of the LollipopAccessibilityInjector. * Constructs an instance of the LollipopAccessibilityInjector.
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
package org.chromium.content.browser.accessibility; package org.chromium.content.browser.accessibility;
import android.annotation.TargetApi;
import android.os.Build;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
...@@ -17,6 +19,7 @@ import org.chromium.content.browser.ContentViewCore; ...@@ -17,6 +19,7 @@ import org.chromium.content.browser.ContentViewCore;
* AccessibilityNodeProvider and delegates its implementation to this object. * AccessibilityNodeProvider and delegates its implementation to this object.
*/ */
@JNINamespace("content") @JNINamespace("content")
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public class LollipopBrowserAccessibilityManager extends JellyBeanBrowserAccessibilityManager { public class LollipopBrowserAccessibilityManager extends JellyBeanBrowserAccessibilityManager {
LollipopBrowserAccessibilityManager(long nativeBrowserAccessibilityManagerAndroid, LollipopBrowserAccessibilityManager(long nativeBrowserAccessibilityManagerAndroid,
ContentViewCore contentViewCore) { ContentViewCore contentViewCore) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment