Dr0ptp4kt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/140874
Change subject: Updating On and Off dialog box to not have title.
......................................................................
Updating On and Off dialog box to not have title.
* UX asked to have the title inlined in the message area for On/Off transitions.
* Also got rid of dead method.
Change-Id: I5196f20d1029cde433a7e5427b7bdee9ffb9a6b7
---
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
2 files changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/74/140874/1
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index acfc481..bb02efd 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -102,8 +102,8 @@
<string name="create_account_generic_error">Could not create
account</string>
<string name="create_account_no_network">No network connection</string>
<string name="preferences_general_heading">General</string>
- <string name="zero_charged_verbiage">Wikipedia Zero is OFF</string>
- <string name="zero_charged_verbiage_extended">Further usage may incur data
charges.</string>
+ <string name="zero_charged_verbiage">Wikipedia Zero is off</string>
+ <string name="zero_charged_verbiage_extended">Loading other articles may
incur data charges.</string>
<string name="zero_search_hint">Search Wikipedia Zero</string>
<string name="zero_warn_when_leaving">Warn if leaving Wikipedia
Zero</string>
<string name="zero_warn_when_leaving_summary">If your mobile operator
waives data access charges for the Wikipedia app through a Wikipedia Zero
partnership, leaving this setting checked helps you know when you are leaving
the Wikipedia app and could be charged.</string>
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index 0870003..6897102 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -11,6 +11,7 @@
import android.preference.PreferenceManager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarActivity;
+import android.text.Html;
import android.util.Log;
import android.view.Gravity;
import android.view.KeyEvent;
@@ -30,7 +31,6 @@
import org.wikipedia.interlanguage.LangLinksActivity;
import org.wikipedia.recurring.RecurringTasksExecutor;
import org.wikipedia.search.SearchArticlesFragment;
-import org.wikipedia.settings.SettingsActivity;
import org.wikipedia.staticdata.MainPageNameData;
public class PageActivity extends ActionBarActivity {
@@ -326,8 +326,7 @@
}
alert = new AlertDialog.Builder(this);
- alert.setTitle(title);
- alert.setMessage(message);
+ alert.setMessage(Html.fromHtml("<b>" + title + "</b><br/><br/>" +
message));
if (prefsKey != null) {
alert.setPositiveButton(getString(R.string.zero_learn_more_learn_more), new
DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
@@ -362,12 +361,6 @@
});
AlertDialog ad = alert.create();
ad.show();
- }
-
- private void visitSettings() {
- Intent intent = new Intent();
- intent.setClass(getApplicationContext(), SettingsActivity.class);
- startActivity(intent);
}
@Override
--
To view, visit https://gerrit.wikimedia.org/r/140874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5196f20d1029cde433a7e5427b7bdee9ffb9a6b7
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
