1 files changed, 6 insertions, 9 deletions
diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
index 4a046469d9..61e6a42464 100644
--- a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
+++ b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
@@ -19,11 +19,13 @@ package com.android.settings.inputmethod;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import androidx.preference.Preference;
+import android.icu.text.ListFormatter;
 import android.text.BidiFormatter;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 
+import androidx.preference.Preference;
+
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -81,15 +83,10 @@ public class VirtualKeyboardPreferenceController extends AbstractPreferenceContr
 
         final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
 
-        String summary = null;
+        final List<String> summaries = new ArrayList<>();
         for (String label : labels) {
-            if (summary == null) {
-                summary = bidiFormatter.unicodeWrap(label);
-            } else {
-                summary = mContext.getString(R.string.join_many_items_middle, summary,
-                        bidiFormatter.unicodeWrap(label));
-            }
+            summaries.add(bidiFormatter.unicodeWrap(label));
         }
-        preference.setSummary(summary);
+        preference.setSummary(ListFormatter.getInstance().format(summaries));
     }
 }