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

am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev

Browse Source 
* commit '1b87bec5de17dc23cf63d9f71358b8c979f8c896':
  If a device identifier is specified, bring up keyboard layouts dialog.
This commit is contained in:
Michael Wright
2014-09-25 22:26:59 +00:00
committed by Android Git Automerger
parent 15f71b3f95 1b87bec5de
commit 28a049a694
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,9 +147,10 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
mGameControllerCategory = (PreferenceCategory)findPreference( mGameControllerCategory = (PreferenceCategory)findPreference(
"game_controller_settings_category"); "game_controller_settings_category");
final Intent startingIntent = activity.getIntent();
// Filter out irrelevant features if invoked from IME settings button. // Filter out irrelevant features if invoked from IME settings button.
mShowsOnlyFullImeAndKeyboardList = Settings.ACTION_INPUT_METHOD_SETTINGS.equals( mShowsOnlyFullImeAndKeyboardList = Settings.ACTION_INPUT_METHOD_SETTINGS.equals(
activity.getIntent().getAction()); startingIntent.getAction());
if (mShowsOnlyFullImeAndKeyboardList) { if (mShowsOnlyFullImeAndKeyboardList) {
getPreferenceScreen().removeAll(); getPreferenceScreen().removeAll();
getPreferenceScreen().addPreference(mHardKeyboardCategory); getPreferenceScreen().addPreference(mHardKeyboardCategory);
@@ -182,6 +183,14 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
mSettingsObserver = new SettingsObserver(mHandler, activity); mSettingsObserver = new SettingsObserver(mHandler, activity);
mDpm = (DevicePolicyManager) (getActivity(). mDpm = (DevicePolicyManager) (getActivity().
getSystemService(Context.DEVICE_POLICY_SERVICE)); getSystemService(Context.DEVICE_POLICY_SERVICE));
// If we've launched from the keyboard layout notification, go ahead and just show the
// keyboard layout dialog.
final InputDeviceIdentifier identifier =
startingIntent.getParcelableExtra(Settings.EXTRA_INPUT_DEVICE_IDENTIFIER);
if (mShowsOnlyFullImeAndKeyboardList && identifier != null) {
showKeyboardLayoutDialog(identifier);
}
} }
private void updateInputMethodSelectorSummary(int value) { private void updateInputMethodSelectorSummary(int value) {