Commit: e988a213419c1f4d3f4def78ba598043e2a03b68 - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• Révision: e988a213419c1f4d3f4def78ba598043e2a03b68 (tree)
• l'heure: 2011-08-05 15:37:50
• Auteur: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Message de Log

KeyboardPicker: refine the keyboard layout list to be more extendable

Other improvements:
* use ISO 639-1 language code for layout names.
* add Japanese, Swedish and United Kingdom to the list.
* add license notice.

Change Summary

• modified: src/com/android/settings/KeyboardPicker.java

Modification

--- a/src/com/android/settings/KeyboardPicker.java
+++ b/src/com/android/settings/KeyboardPicker.java
@@ -1,19 +1,38 @@
+/*
+ * Copyright (C) 2009 The Android-x86 Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.android.settings;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TreeMap;
 
 import android.app.ListActivity;
 import android.os.Bundle;
 import android.os.SystemProperties;
-import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 
-public class KeyboardPicker extends ListActivity{
-	int getContentView() {
+public class KeyboardPicker extends ListActivity {
+    private List<String> mKeyboardList;
+    private TreeMap<String,String> mKeyboardLayouts;
+
+    int getContentView() {
         return R.layout.keyboard_picker;
     }
 
@@ -23,46 +42,28 @@ public class KeyboardPicker extends ListActivity{
         setContentView(getContentView());
         int layoutId = R.layout.keyboard_picker_item;
         int fieldId = R.id.keyboard;
-        List<String> mKeyboardLayout = new ArrayList<String>();
-        mKeyboardLayout.add("American(Standard keyboard)");
-        mKeyboardLayout.add("Finnish");
-        mKeyboardLayout.add("French");
-        mKeyboardLayout.add("German");
-        mKeyboardLayout.add("Ireland");
-        mKeyboardLayout.add("Russia");
-        mKeyboardLayout.add("Spanish(Latin America)");
-
+        mKeyboardLayouts = new TreeMap<String,String>();
+        mKeyboardLayouts.put("American(Standard keyboard)", "qwerty");
+        mKeyboardLayouts.put("Finnish", "fn");
+        mKeyboardLayouts.put("French", "fr");
+        mKeyboardLayouts.put("German", "de");
+        mKeyboardLayouts.put("Ireland", "uk");
+        mKeyboardLayouts.put("Japanese", "jp");
+        mKeyboardLayouts.put("Russian", "ru");
+        mKeyboardLayouts.put("Spanish(Latin America)", "es_latin");
+        mKeyboardLayouts.put("Swedish", "fn");
+        mKeyboardLayouts.put("United Kingdom", "uk");
 
+        mKeyboardList = new ArrayList<String>(mKeyboardLayouts.keySet());
         ArrayAdapter<String> adapter =
-            new ArrayAdapter<String>(this, layoutId, fieldId, mKeyboardLayout);
+                new ArrayAdapter<String>(this, layoutId, fieldId, mKeyboardList);
         getListView().setAdapter(adapter);
     }
     @Override
     protected void onListItemClick(ListView l, View v, int position, long id) {
-        switch(position){
-		case 1:
-			SystemProperties.set("persist.sys.keylayout","fn");
-			break;
-		case 2:
-			SystemProperties.set("persist.sys.keylayout","fr");
-			break;
-		case 3:
-			SystemProperties.set("persist.sys.keylayout","de");
-			break;
-		case 4:
-			SystemProperties.set("persist.sys.keylayout","Ireland");
-			break;
-		case 5:
-			SystemProperties.set("persist.sys.keylayout","ru");
-			break;
-		case 6:
-			SystemProperties.set("persist.sys.keylayout","spanish_latin");
-			break;
-		default:
-			SystemProperties.set("persist.sys.keylayout","qwerty");
-			break;
-	  }
-
-        Toast.makeText(this, "Please reboot your machine to enable the new keyboard layout.", Toast.LENGTH_LONG).show();
+        String kb = mKeyboardList.get(position);
+        SystemProperties.set("persist.sys.keylayout", mKeyboardLayouts.get(kb));
+        Toast.makeText(this, "Set keyboard layout to " + kb +
+                ".\nPlease reboot your machine to enable the new keyboard layout.", Toast.LENGTH_LONG).show();
     }
 }