[MediaWiki-commits] [Gerrit] [Gingerbread] Get more things using the support version of t... - change (apps...wikipedia)
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; -
[MediaWiki-commits] [Gerrit] [Gingerbread] Get more things using the support version of t... - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/122607 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(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/07/122607/1 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 88b82ab..f575faa 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.*; @@ -42,7 +43,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 { @@ -100,7 +101,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 87259ee..22f0cc9 100644 --- a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java @@ -55,7 +55,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); @@ -68,7 +68,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); @@ -261,7 +261,7 @@ private void cancelAbuseFilter() { abusefilterEditResult =