diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-09-03 15:57:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-03 15:57:24 +0000 |
| commit | a2aaf0e60fcbfc5b6eaac06e9663e2af0bc82c7c (patch) | |
| tree | bb5aa94b15b7a6465e6ad230081d078f952be4a0 /src/com/android | |
| parent | a2904f9d5091ef5055d97adf72d32e8c19551c8e (diff) | |
| parent | 3a14ae2655310de454ab78d3d8fd2ea61a6037ab (diff) | |
| download | packages_apps_Settings-a2aaf0e60fcbfc5b6eaac06e9663e2af0bc82c7c.tar.gz packages_apps_Settings-a2aaf0e60fcbfc5b6eaac06e9663e2af0bc82c7c.tar.bz2 packages_apps_Settings-a2aaf0e60fcbfc5b6eaac06e9663e2af0bc82c7c.zip | |
Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/Settings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index a58d2b7ca..a23fa1a48 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -71,6 +71,7 @@ import com.android.settings.deviceinfo.Memory; import com.android.settings.deviceinfo.UsbSettings; import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.inputmethod.InputMethodAndLanguageSettings; +import com.android.settings.inputmethod.KeyboardLayoutPickerFragment; import com.android.settings.inputmethod.SpellCheckersSettings; import com.android.settings.inputmethod.UserDictionaryList; import com.android.settings.location.LocationSettings; @@ -336,7 +337,8 @@ public class Settings extends PreferenceActivity ManageAccountsSettings.class.getName(), PrintingSettings.class.getName(), TrustedCredentialsSettings.class.getName(), - PaymentSettings.class.getName() + PaymentSettings.class.getName(), + KeyboardLayoutPickerFragment.class.getName() }; @Override |