Dbrant has submitted this change and it was merged.
Change subject: Swap the order of language names in language selectors.
......................................................................
Swap the order of language names in language selectors.
In the "Read in another language" option and "Wikipedia language" setting, the
languages are displayed with the current device language's name in large text,
and the name of the language in the language itself in small text. This patch
flips that behaviour, so that the name of the language in the language itself
is prioritised.
Change-Id: I672cee2cf8b6e5ffdc25356d285b2235532c671d
---
M wikipedia/res/layout/item_language_list_entry.xml
M wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
diff --git a/wikipedia/res/layout/item_language_list_entry.xml
b/wikipedia/res/layout/item_language_list_entry.xml
index 1766a9e..61a4c9e 100644
--- a/wikipedia/res/layout/item_language_list_entry.xml
+++ b/wikipedia/res/layout/item_language_list_entry.xml
@@ -11,7 +11,7 @@
android:background="@drawable/selectable_item_background"
>
<TextView
- android:id="@+id/language_list_language_name"
+ android:id="@+id/language_list_language_local_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -20,7 +20,7 @@
android:ellipsize="marquee"
/>
<TextView
- android:id="@+id/language_list_language_local_name"
+ android:id="@+id/language_list_language_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
diff --git
a/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
b/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
index 0c88fd9..8f6fd5f 100644
--- a/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
+++ b/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java
@@ -145,15 +145,15 @@
convertView =
LayoutInflater.from(parent.getContext()).inflate(R.layout.simple_list_item_activated_2,
parent, false);
}
- TextView nameText = (TextView)
convertView.findViewById(android.R.id.text1);
- TextView localNameText = (TextView)
convertView.findViewById(android.R.id.text2);
+ TextView localNameText = (TextView)
convertView.findViewById(android.R.id.text1);
+ TextView nameText = (TextView)
convertView.findViewById(android.R.id.text2);
String wikiCode = (String) getItem(position);
int langIndex = app.findWikiIndex(wikiCode);
- nameText.setText(app.canonicalNameFor(langIndex));
localNameText.setText(app.localNameFor(langIndex));
+ nameText.setText(app.canonicalNameFor(langIndex));
return convertView;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/158892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I672cee2cf8b6e5ffdc25356d285b2235532c671d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: 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
