commit db6f1f2cb52ffc38eeecfca734be23181d420ff4
author Yohei Yukawa <yukawa@google.com> Thu Jun 16 21:24:04 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 16 21:24:05 2016 +0000
tree aedc7901566500577dea28fffc34cd045a085376
parent 32b427b137b325e97a194739e83930a0ef3a3971
parent 966476b7dc2edc4785e29ea061c03f267fed785c

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

src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java

diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index e22d22c..84223b7 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -30,6 +30,7 @@
 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 @@
 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 @@
                 getContentResolver(),
                 new HashMap<>(),
                 new ArrayList<>(),
-                USER_SYSTEM,
+                UserHandle.myUserId(),
                 false /* copyOnWrite */);
         mKeyboardAssistanceCategory = Preconditions.checkNotNull(
                 (PreferenceCategory) findPreference(KEYBOARD_ASSISTANCE_CATEGORY));
@@ -245,7 +245,7 @@
                 Secure.getUriFor(Secure.SHOW_IME_WITH_HARD_KEYBOARD),
                 false,
                 mContentObserver,
-                USER_SYSTEM);
+                UserHandle.myUserId());
         updateShowVirtualKeyboardSwitch();
     }