jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: extremely light clean up
......................................................................
Hygiene: extremely light clean up
• Replace deprecated method call.
• Add missing @Override.
• Remove unused namespace.
No functional changes intended.
Change-Id: Ieb8d172269f5f721f45823d53d9f1f4a13669e4c
---
M app/src/main/java/org/wikipedia/login/authmanager/AMLoginTask.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/res/layout/item_gallery_thumbnail.xml
3 files changed, 54 insertions(+), 54 deletions(-)
Approvals:
Mholloway: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/login/authmanager/AMLoginTask.java
b/app/src/main/java/org/wikipedia/login/authmanager/AMLoginTask.java
index 8a01bdd..a4f1d3c 100644
--- a/app/src/main/java/org/wikipedia/login/authmanager/AMLoginTask.java
+++ b/app/src/main/java/org/wikipedia/login/authmanager/AMLoginTask.java
@@ -21,7 +21,7 @@
this.password = password;
}
- public RequestBuilder buildRequest(Api api) {
+ @Override public RequestBuilder buildRequest(Api api) {
// HACK: T124384
WikipediaApp.getInstance().getEditTokenStorage().clearAllTokens();
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index 1fa1bc8..aa17648 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -1,12 +1,58 @@
package org.wikipedia.page;
+import android.annotation.TargetApi;
+import android.app.SearchManager;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.location.Location;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.BottomSheetDialog;
+import android.support.design.widget.BottomSheetDialogFragment;
+import android.support.design.widget.NavigationView;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.view.ActionMode;
+import android.support.v7.widget.Toolbar;
+import android.text.Html;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.squareup.otto.Bus;
+import com.squareup.otto.Subscribe;
+
+import net.hockeyapp.android.metrics.MetricsManager;
+
import org.wikipedia.BackPressedHandler;
import org.wikipedia.R;
import org.wikipedia.Site;
-import org.wikipedia.activity.ActivityUtil;
-import org.wikipedia.activity.ThemedActionBarActivity;
import org.wikipedia.ViewAnimations;
import org.wikipedia.WikipediaApp;
+import org.wikipedia.activity.ActivityUtil;
+import org.wikipedia.activity.ThemedActionBarActivity;
import org.wikipedia.analytics.IntentFunnel;
import org.wikipedia.analytics.ReadingListsFunnel;
import org.wikipedia.analytics.WikipediaZeroUsageFunnel;
@@ -38,53 +84,8 @@
import org.wikipedia.widgets.WidgetProviderFeaturedPage;
import org.wikipedia.zero.ZeroConfig;
-import com.squareup.otto.Bus;
-import com.squareup.otto.Subscribe;
-
-import android.annotation.TargetApi;
-import android.app.SearchManager;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.location.Location;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetDialog;
-import android.support.design.widget.BottomSheetDialogFragment;
-import android.support.design.widget.NavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.widget.Toolbar;
-import android.support.v7.view.ActionMode;
-import android.text.Html;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import net.hockeyapp.android.metrics.MetricsManager;
-
-import static org.wikipedia.util.DeviceUtil.isBackKeyUp;
import static org.wikipedia.util.DeviceUtil.hideSoftKeyboard;
+import static org.wikipedia.util.DeviceUtil.isBackKeyUp;
import static org.wikipedia.util.UriUtil.visitInExternalBrowser;
public class PageActivity extends ThemedActionBarActivity {
@@ -526,7 +527,7 @@
}
/**
- * Add a new fragment to the top of the activity's backstack, and
optionally allow state loss.
+ * Add a new fragment to the top of the activity's backstack, and
optionally allow state loss.
* Useful for cases where we might push a fragment from an AsyncTask
result.
* @param f New fragment to place on top.
* @param allowStateLoss Whether to allow state loss.
@@ -791,8 +792,8 @@
if (leftZeroRatedNetwork(latestZeroEnabledState)) {
app.getWikipediaZeroHandler().showZeroOffBanner(PageActivity.this,
getString(R.string.zero_charged_verbiage),
- getResources().getColor(R.color.holo_red_dark),
- getResources().getColor(android.R.color.white));
+ ContextCompat.getColor(PageActivity.this,
R.color.holo_red_dark),
+ ContextCompat.getColor(PageActivity.this,
android.R.color.white));
navDrawerHelper.setupDynamicNavDrawerItems();
}
@@ -1046,4 +1047,4 @@
widgetIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids);
sendBroadcast(widgetIntent);
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_gallery_thumbnail.xml
b/app/src/main/res/layout/item_gallery_thumbnail.xml
index 834edb2..c214fa6 100644
--- a/app/src/main/res/layout/item_gallery_thumbnail.xml
+++ b/app/src/main/res/layout/item_gallery_thumbnail.xml
@@ -2,7 +2,6 @@
<com.facebook.drawee.view.SimpleDraweeView
style="@style/SimpleDraweeViewPlaceholder"
xmlns:android="http://schemas.android.com/apk/res/android";
- xmlns:app="http://schemas.android.com/apk/res-auto";
android:id="@+id/gallery_thumbnail_image"
android:layout_width="@dimen/linkPreviewImageSize"
android:layout_height="@dimen/linkPreviewImageSize"
--
To view, visit https://gerrit.wikimedia.org/r/293214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb8d172269f5f721f45823d53d9f1f4a13669e4c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
