Bug 1287651 - Mark methods as @Override now that we're compiling with a newer SDK. r?jchen
MozReview-Commit-ID: vrB0IOmob0
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputConnection.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputConnection.java
@@ -1,16 +1,15 @@
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.geckoview;
-import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Matrix;
import android.graphics.RectF;
import android.media.AudioManager;
import android.os.Build;
@@ -577,21 +576,17 @@ import java.lang.reflect.Proxy;
final View v = getView();
if (v == null) {
return false;
}
final Configuration config = v.getContext().getResources().getConfiguration();
return config.keyboard != Configuration.KEYBOARD_NOKEYS;
}
- // Android N: @Override // InputConnection
- // We need to suppress lint complaining about the lack override here in the meantime: it wants us to build
- // against sdk 24, even though we're using 23, and therefore complains about the lack of override.
- // Once we update to 24, we can use the actual override annotation and remove the lint suppression.
- @SuppressLint("Override")
+ @Override // InputConnection
public Handler getHandler() {
final Handler handler;
if (isPhysicalKeyboardPresent()) {
handler = ThreadUtils.getUiHandler();
} else {
handler = getBackgroundHandler();
}
return mEditableClient.setInputConnectionHandler(handler);
@@ -601,18 +596,18 @@ import java.lang.reflect.Proxy;
public Handler getHandler(Handler defHandler) {
if (!canReturnCustomHandler()) {
return defHandler;
}
return getHandler();
}
- // Android N: @Override // InputConnection
- @SuppressLint("Override")
+
+ @Override // InputConnection
public void closeConnection() {
// Not supported at the moment.
}
@Override // SessionTextInput.Delegate
public synchronized InputConnection onCreateInputConnection(EditorInfo outAttrs) {
// Some keyboards require us to fill out outAttrs even if we return null.
outAttrs.inputType = InputType.TYPE_CLASS_TEXT;