Yuvipanda has submitted this change and it was merged. Change subject: [Gingerbread] Get more things using the support version of the action bar accessors ......................................................................
[Gingerbread] Get more things using the support version of the action bar accessors Change-Id: Ib49be67baa446fe68b3e73a7220fce8b2a36d3f7 --- M wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java M wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java M wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java M wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java M wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java M wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java M wikipedia/src/main/java/org/wikipedia/settings/SettingsActivity.java 8 files changed, 19 insertions(+), 14 deletions(-) Approvals: Yuvipanda: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java b/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java index 59477e1..2da61b8 100644 --- a/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java +++ b/wikipedia/src/main/java/org/wikipedia/editing/CaptchaHandler.java @@ -3,6 +3,7 @@ import android.app.*; import android.net.*; import android.os.*; +import android.support.v7.app.ActionBarActivity; import android.util.*; import android.view.*; import android.widget.*; @@ -83,7 +84,7 @@ .into(captchaImage, new Callback() { @Override public void onSuccess() { - activity.getActionBar().setTitle(R.string.title_captcha); + ((ActionBarActivity)activity).getSupportActionBar().setTitle(R.string.title_captcha); progressDialog.hide(); // In case there was a captcha attempt before @@ -102,7 +103,7 @@ } public void hideCaptcha() { - activity.getActionBar().setTitle(prevTitleId); + ((ActionBarActivity)activity).getSupportActionBar().setTitle(prevTitleId); Utils.crossFade(captchaContainer, primaryView); } diff --git a/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java b/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java index 129f354..c83aa32 100644 --- a/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/editing/EditPreviewFragment.java @@ -3,6 +3,7 @@ import android.app.*; import android.os.*; import android.support.v4.app.Fragment; +import android.support.v7.app.ActionBarActivity; import android.view.*; import org.json.*; import org.wikipedia.*; @@ -44,7 +45,7 @@ } private void displayPreview(final String html) { - getActivity().getActionBar().setTitle(R.string.edit_preview_activity_title); + ((ActionBarActivity)getActivity()).getSupportActionBar().setTitle(R.string.edit_preview_activity_title); Utils.crossFade(getActivity().findViewById(R.id.edit_section_container), previewContainer); JSONObject payload = new JSONObject(); try { @@ -102,7 +103,7 @@ public void hide() { Utils.crossFade(previewContainer, getActivity().findViewById(R.id.edit_section_container)); - getActivity().getActionBar().setTitle(R.string.edit_section_activity_title); + ((ActionBarActivity)getActivity()).getSupportActionBar().setTitle(R.string.edit_section_activity_title); } diff --git a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java index 6a9c6ba..d69a1f3 100644 --- a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java @@ -57,7 +57,7 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_edit_section); - getActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); if (!getIntent().getAction().equals(ACTION_EDIT_SECTION)) { throw new RuntimeException("Much wrong action. Such exception. Wow"); @@ -70,7 +70,7 @@ progressDialog = new ProgressDialog(this); - getActionBar().setTitle(getString(R.string.editsection_activity_title)); + getSupportActionBar().setTitle(getString(R.string.editsection_activity_title)); sectionText = (EditText) findViewById(R.id.edit_section_text); sectionProgress = findViewById(R.id.edit_section_load_progress); @@ -265,7 +265,7 @@ private void cancelAbuseFilter() { abusefilterEditResult = null; - getActionBar().setTitle(R.string.editsection_activity_title); + getSupportActionBar().setTitle(R.string.editsection_activity_title); Utils.crossFade(abusefilterContainer, sectionContainer); } @@ -343,7 +343,7 @@ private void displaySectionText() { sectionText.setText(sectionWikitext); Utils.crossFade(sectionProgress, sectionContainer); - invalidateOptionsMenu(); + supportInvalidateOptionsMenu(); } @Override diff --git a/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java b/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java index 50cc8b3..5e69bb3 100644 --- a/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java @@ -56,7 +56,7 @@ }); getSupportLoaderManager().initLoader(0, null, this); - getActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); } @Override diff --git a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java index 8ae67d9..d2f4473 100644 --- a/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/interlanguage/LangLinksActivity.java @@ -32,7 +32,7 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_langlinks); - getActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); if (!getIntent().getAction().equals(ACTION_LANGLINKS_FOR_TITLE)) { throw new RuntimeException("Only ACTION_LANGLINKS_FOR_TITLE is supported"); diff --git a/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java index be4a6c7..fe89c85 100644 --- a/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java @@ -31,7 +31,7 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_login); - getActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); app = (WikipediaApp)getApplicationContext(); @@ -43,7 +43,7 @@ nonEmptyValidator = new NonEmptyValidator(new NonEmptyValidator.ValidationChangedCallback() { @Override public void onValidationChanged(boolean isValid) { - invalidateOptionsMenu(); + supportInvalidateOptionsMenu(); } }, usernameText, passwordText); diff --git a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java index 4806056..5cd7e7c 100644 --- a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesActivity.java @@ -121,7 +121,7 @@ }); getSupportLoaderManager().initLoader(0, null, this); - getActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); } @Override diff --git a/wikipedia/src/main/java/org/wikipedia/settings/SettingsActivity.java b/wikipedia/src/main/java/org/wikipedia/settings/SettingsActivity.java index 8f10476..7b95840 100644 --- a/wikipedia/src/main/java/org/wikipedia/settings/SettingsActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/settings/SettingsActivity.java @@ -11,7 +11,10 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.preferences); - getActionBar().setDisplayHomeAsUpEnabled(true); + // Hmm. Can't use ActionBarActivity? + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + getActionBar().setDisplayHomeAsUpEnabled(true); + } } public boolean onMenuItemSelected(int featureId, MenuItem item) { -- To view, visit https://gerrit.wikimedia.org/r/122607 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib49be67baa446fe68b3e73a7220fce8b2a36d3f7 Gerrit-PatchSet: 6 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: 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