jenkins-bot has submitted this change and it was merged.
Change subject: No longer showing OK/Cancel buttons when selecting language.
......................................................................
No longer showing OK/Cancel buttons when selecting language.
Bug: 64422
Change-Id: Ic1b4d10329212d43262be555a4a739ebcfff992a
---
M wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
1 file changed, 13 insertions(+), 11 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
b/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
index 20f90b6..02d80fe 100644
--- a/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
+++ b/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
@@ -25,6 +25,8 @@
app = (WikipediaApp) context.getApplicationContext();
int langIndex = app.findWikiIndex(app.getPrimaryLanguage());
setSummary(app.localNameFor(langIndex));
+ setPositiveButtonText(null);
+ setNegativeButtonText(null);
}
@Override
@@ -32,6 +34,17 @@
super.onBindDialogView(view);
languagesFilter = (EditText)
view.findViewById(R.id.preference_languages_filter);
languagesList = (ListView)
view.findViewById(R.id.preference_languages_list);
+
+ languagesList.setOnItemClickListener(new
AdapterView.OnItemClickListener() {
+ @Override
+ public void onItemClick(AdapterView<?> adapterView, View view, int
i, long l) {
+ String lang = (String) languagesList.getAdapter().getItem(i);
+ app.setPrimaryLanguage(lang);
+ int langIndex = app.findWikiIndex(app.getPrimaryLanguage());
+ setSummary(app.localNameFor(langIndex));
+ LanguagePreference.this.getDialog().dismiss();
+ }
+ });
languagesList.setAdapter(new LanguagesAdapter(languages, app));
@@ -54,17 +67,6 @@
}
});
- }
-
- @Override
- protected void onDialogClosed(boolean positiveResult) {
- super.onDialogClosed(positiveResult);
- if (positiveResult) {
- String lang = (String)
languagesList.getAdapter().getItem(languagesList.getCheckedItemPosition());
- app.setPrimaryLanguage(lang);
- int langIndex = app.findWikiIndex(app.getPrimaryLanguage());
- setSummary(app.localNameFor(langIndex));
- }
}
public String getCurrentLanguageDisplayString() {
--
To view, visit https://gerrit.wikimedia.org/r/129819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1b4d10329212d43262be555a4a739ebcfff992a
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
