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

Merge \"Teach hard keyboard settings about correct user ID\" into nyc-dev

Browse Source 
am: db6f1f2cb5

Change-Id: Ie47fd6128435c75cc08d3d478a23c442f44a514c
This commit is contained in:
Yohei Yukawa
2016-06-16 21:40:53 +00:00
committed by android-build-merger
parent 600a1eeec5 db6f1f2cb5
commit 75778049ba
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
View File

@@ -30,6 +30,7 @@ import android.hardware.input.InputManager;
import android.hardware.input.KeyboardLayout;
import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings.Secure;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
@@ -60,7 +61,6 @@ import java.util.Objects;
public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
implements InputManager.InputDeviceListener {
private static final int USER_SYSTEM = 0;
private static final String KEYBOARD_ASSISTANCE_CATEGORY = "keyboard_assistance_category";
private static final String SHOW_VIRTUAL_KEYBOARD_SWITCH = "show_virtual_keyboard_switch";
private static final String KEYBOARD_SHORTCUTS_HELPER = "keyboard_shortcuts_helper";
@@ -93,7 +93,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
getContentResolver(),
new HashMap<>(),
new ArrayList<>(),
USER_SYSTEM,
UserHandle.myUserId(),
false /* copyOnWrite */);
mKeyboardAssistanceCategory = Preconditions.checkNotNull(
(PreferenceCategory) findPreference(KEYBOARD_ASSISTANCE_CATEGORY));
@@ -245,7 +245,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
Secure.getUriFor(Secure.SHOW_IME_WITH_HARD_KEYBOARD),
false,
mContentObserver,
USER_SYSTEM);
UserHandle.myUserId());
updateShowVirtualKeyboardSwitch();
}