jenkins-bot has submitted this change and it was merged.
Change subject: Fix crash when long-pressing in the WebView.
......................................................................
Fix crash when long-pressing in the WebView.
It was because our PageActivity extends ActionBarActivity, but keeps the
ActionBar hidden. TODO: Make the PageActivity use the true ActionBar.
Bug 68166
Change-Id: I57ce3fd74f8b5420af4500b0770a81bbb9bdfad4
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 2 insertions(+), 8 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index 12afe34..e2bfaa2 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -6,11 +6,10 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
-import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
+import android.support.v4.app.FragmentActivity;
import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarActivity;
import android.text.Html;
import android.util.Log;
import android.view.Gravity;
@@ -37,7 +36,7 @@
import org.wikipedia.staticdata.MainPageNameData;
import org.wikipedia.theme.ThemeChooserDialog;
-public class PageActivity extends ActionBarActivity {
+public class PageActivity extends FragmentActivity {
public static final String ACTION_PAGE_FOR_TITLE =
"org.wikipedia.page_for_title";
public static final String EXTRA_PAGETITLE = "org.wikipedia.pagetitle";
public static final String EXTRA_HISTORYENTRY =
"org.wikipedia.history.historyentry";
@@ -88,11 +87,6 @@
PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
setContentView(R.layout.activity_main);
-
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
- // need to explicitly hide ActionBar for API10 :(
- getSupportActionBar().hide();
- }
bus = app.getBus();
bus.register(this);
--
To view, visit https://gerrit.wikimedia.org/r/147111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57ce3fd74f8b5420af4500b0770a81bbb9bdfad4
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
