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

packages/apps/Settings

Commit MetaInfo

• Révision: bfd75517c8403b7b983e63c1858d090aebe4c9f3 (tree)
• l'heure: 2012-06-27 05:02:58
• Auteur: Stefan Seidel <android@stef...>
• Commiter: Stefan Seidel

Message de Log

[2/2] change hardware keyboard layout on the fly

This change will allow reconfiguration of the layout of the hardware keyboard.
These are the UI changes.

Parts of this code were inspired by the work of Christopher-Eyk Hrabia
(https://github.com/cehberlin).

Change Summary

• modified: res/values/arrays.xml
• modified: res/values/strings.xml
• modified: res/xml/hard_keyboard_settings.xml
• modified: res/xml/language_settings.xml
• modified: src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

Modification

--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -602,6 +602,24 @@
         <item>Always use HDCP checking</item>
     </string-array>
 
+    <!-- Titles for hardware keyboard layout preference. -->
+    <string-array name="hardware_keyboard_layout_titles">
+        <item>Use system language</item>
+        <item>English</item>
+        <item>French</item>
+        <item>German</item>
+        <item>Russian</item>
+    </string-array>
+
+    <!-- Values for hardware keyboard layout preference. -->
+    <string-array name="hardware_keyboard_layout_keys" translatable="false" >
+        <item>sys</item>
+        <item>en</item>
+        <item>fr</item>
+        <item>de</item>
+        <item>ru</item>
+    </string-array>
+
     <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
     <string-array name="window_animation_scale_entries">
         <item>Animation off</item>

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2566,6 +2566,12 @@ found in the list of installed apps.</string>
     <string name="hardkeyboard_category">Physical keyboard settings</string>
     <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
     <string name="auto_punctuate_summary">Press Space key twice to insert \u0022.\u0022</string>
+    <!-- On Text & language settings screen, option for physical keyboard layout -->
+    <string name="hardware_keyboard_layout_title">Physical keyboard layout</string>
+    <!-- On Text & language settings screen, title for physical keyboard layout selection dialog -->
+    <string name="hardware_keyboard_layout_dialog_title">Select physical keyboard layout</string>
+    <!-- On Text & language settings screen, option for physical keyboard layout -->
+    <string name="hardware_keyboard_layout_changed">Physical keyboard layout has been changed. This change is NOT effective for previously started apps. It is recommended to restart your device to fully apply the new layout.</string>
     <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
     <string name="show_password">Make passwords visible</string>
     <!-- On Security & location settings screen, setting check box summary. Summary for the visible passwords setting. -->

--- a/res/xml/hard_keyboard_settings.xml
+++ b/res/xml/hard_keyboard_settings.xml
@@ -39,5 +39,12 @@
                 android:summaryOn="@string/auto_punctuate_summary"
                 android:summaryOff="@string/auto_punctuate_summary"
                 android:persistent="false"/>
+
+        <ListPreference
+                android:key="hardware_keyboard_layout_selector"
+                android:title="@string/hardware_keyboard_layout_title"
+                android:dialogTitle="@string/hardware_keyboard_layout_dialog_title"
+                android:entries="@array/hardware_keyboard_layout_titles"
+                android:entryValues="@array/hardware_keyboard_layout_keys" />
     </PreferenceCategory>
 </PreferenceScreen>

--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -58,6 +58,12 @@
                 android:summaryOn="@string/auto_punctuate_summary"
                 android:summaryOff="@string/auto_punctuate_summary"
                 android:persistent="false"/>
+        <ListPreference
+                android:key="hardware_keyboard_layout_selector"
+                android:title="@string/hardware_keyboard_layout_title"
+                android:dialogTitle="@string/hardware_keyboard_layout_dialog_title"
+                android:entries="@array/hardware_keyboard_layout_titles"
+                android:entryValues="@array/hardware_keyboard_layout_keys" />
     </PreferenceCategory>
 
     <PreferenceCategory android:key="voice_category"

--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -31,6 +31,7 @@ import android.content.res.Configuration;
 import android.database.ContentObserver;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -42,6 +43,7 @@ import android.provider.Settings.System;
 import android.text.TextUtils;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.Toast;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -58,6 +60,10 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
     // false: on ICS or later
     private static final boolean SHOW_INPUT_METHOD_SWITCHER_SETTINGS = false;
 
+    private static final String KEY_HARDWARE_KEYBOARD_LAYOUT_SELECTOR =
+        "hardware_keyboard_layout_selector";
+    private static final String PROP_HARDWARE_KEYBOARD_LAYOUT = "persist.sys.keyboard.locale";
+
     private static final String[] sSystemSettingNames = {
         System.TEXT_AUTO_REPLACE, System.TEXT_AUTO_CAPS, System.TEXT_AUTO_PUNCTUATE,
     };
@@ -73,6 +79,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
             new ArrayList<InputMethodPreference>();
     private boolean mHaveHardKeyboard;
     private PreferenceCategory mHardKeyboardCategory;
+    private ListPreference mHardKeyboardLayoutSelectorPref;
     private InputMethodManager mImm;
     private List<InputMethodInfo> mImis;
     private boolean mIsOnlyImeSettings;
@@ -196,6 +203,8 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
                 chkPref.setChecked(
                         System.getInt(getContentResolver(), sSystemSettingNames[i], 1) > 0);
             }
+
+            updateHardKeyboardLayout(SystemProperties.get(PROP_HARDWARE_KEYBOARD_LAYOUT));
         }
 
         // IME
@@ -259,6 +268,25 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
                 mDefaultInputMethodSelectorVisibility);
     }
 
+    private void updateHardKeyboardLayout(String value) {
+        // selector of hardware keyboard layout
+        mHardKeyboardLayoutSelectorPref = (ListPreference) mHardKeyboardCategory.findPreference(
+            KEY_HARDWARE_KEYBOARD_LAYOUT_SELECTOR);
+        int index = 0; // defaults to "follow system language"
+        String[] values = getResources().getStringArray(R.array.hardware_keyboard_layout_keys);
+        String[] summaries = getResources().getStringArray(
+            R.array.hardware_keyboard_layout_titles);
+        for (int i = 0; i < values.length; i++) {
+            if (value.equals(values[i])) {
+                index = i;
+                break;
+            }
+        }
+        mHardKeyboardLayoutSelectorPref.setValue(values[index]);
+        mHardKeyboardLayoutSelectorPref.setSummary(summaries[index]);
+        mHardKeyboardLayoutSelectorPref.setOnPreferenceChangeListener(this);
+    }
+
     @Override
     public boolean onPreferenceChange(Preference preference, Object value) {
         if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
@@ -268,6 +296,14 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
                 }
             }
         }
+        if (preference == mHardKeyboardLayoutSelectorPref) {
+            SystemProperties.set(PROP_HARDWARE_KEYBOARD_LAYOUT, value.toString());
+            Settings.System.putString(getContentResolver(), Settings.System.HARD_KEYBOARD_LAYOUT,
+                value.toString());
+            Toast.makeText(getActivity(), R.string.hardware_keyboard_layout_changed,
+                Toast.LENGTH_LONG).show();
+            updateHardKeyboardLayout(value.toString());
+        }
         return false;
     }