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

am: 6a2fa09ff4

Change-Id: Ic185accac95ae48dd5f1a1e184b438db9920550a
This commit is contained in:
Fan Zhang
2017-04-21 01:08:44 +00:00
committed by android-build-merger
2 changed files with 41 additions and 2 deletions

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);