PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bidi wrap keyboard names before displaying them." into oc-dev

Browse Source 
am: b8d6222e23

Change-Id: I46d9cc46789d193d13cdb64f0cccd65dbb1e727f
This commit is contained in:
Fan Zhang
2017-04-21 01:06:16 +00:00
committed by android-build-merger
parent 31eb8cb3d1 b8d6222e23
commit 6a2fa09ff4
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
View File

@@ -20,6 +20,7 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.PackageManager;
import android.support.v7.preference.Preference;
import android.text.BidiFormatter;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
@@ -76,12 +77,15 @@ public class VirtualKeyboardPreferenceController extends PreferenceController {
return;
}
final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
String summary = null;
for (String label : labels) {
if (summary == null) {
summary = label;
summary = bidiFormatter.unicodeWrap(label);
} else {
summary = mContext.getString(R.string.join_many_items_middle, summary, label);
summary = mContext.getString(R.string.join_many_items_middle, summary,
bidiFormatter.unicodeWrap(label));
}
}
preference.setSummary(summary);