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

Add support for grouping keyboard layouts by collection.

Browse Source 
Bug: 6405203
Change-Id: I458c4976562ecea2fa03d96258ff28ebbdc95294
This commit is contained in:
Jeff Brown
2012-05-17 16:02:38 -07:00
parent 70b5999839
commit a350352e03
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
View File

@@ -421,7 +421,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
final PreferenceScreen pref = new PreferenceScreen(getActivity(), null); final PreferenceScreen pref = new PreferenceScreen(getActivity(), null);
pref.setTitle(device.getName()); pref.setTitle(device.getName());
if (keyboardLayout != null) { if (keyboardLayout != null) {
pref.setSummary(keyboardLayout.getLabel()); pref.setSummary(keyboardLayout.toString());
} else { } else {
pref.setSummary(R.string.keyboard_layout_default_label); pref.setSummary(R.string.keyboard_layout_default_label);
} }

25
src/com/android/settings/inputmethod/KeyboardLayoutPicker.java
View File

@@ -27,9 +27,12 @@ import android.hardware.input.InputManager;
import android.hardware.input.KeyboardLayout; import android.hardware.input.KeyboardLayout;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView;
import java.util.Arrays; import java.util.Arrays;
@@ -95,8 +98,26 @@ public class KeyboardLayoutPicker extends ListFragment
private static final class KeyboardLayoutAdapter private static final class KeyboardLayoutAdapter
extends ArrayAdapter<KeyboardLayout> { extends ArrayAdapter<KeyboardLayout> {
private LayoutInflater mInflater;
public KeyboardLayoutAdapter(Context context, KeyboardLayout[] list) { public KeyboardLayoutAdapter(Context context, KeyboardLayout[] list) {
super(context, android.R.layout.simple_list_item_1, list); super(context, android.R.layout.simple_list_item_2, list);
mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View view = convertView;
if (view == null) {
view = mInflater.inflate(android.R.layout.simple_list_item_2, parent, false);
}
KeyboardLayout item = getItem(position);
TextView headline = (TextView) view.findViewById(android.R.id.text1);
TextView subText = (TextView) view.findViewById(android.R.id.text2);
headline.setText(item.getLabel());
subText.setText(item.getCollection());
return view;
} }
} }
@@ -112,7 +133,7 @@ public class KeyboardLayoutPicker extends ListFragment
KeyboardLayout[] list = im.getKeyboardLayouts(); KeyboardLayout[] list = im.getKeyboardLayouts();
KeyboardLayout[] listWithDefault = new KeyboardLayout[list.length + 1]; KeyboardLayout[] listWithDefault = new KeyboardLayout[list.length + 1];
listWithDefault[0] = new KeyboardLayout(null, listWithDefault[0] = new KeyboardLayout(null,
getContext().getString(R.string.keyboard_layout_default_label)); getContext().getString(R.string.keyboard_layout_default_label), "");
System.arraycopy(list, 0, listWithDefault, 1, list.length); System.arraycopy(list, 0, listWithDefault, 1, list.length);
Arrays.sort(listWithDefault); Arrays.sort(listWithDefault);
return listWithDefault; return listWithDefault;