Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow switching keyboard layout to null." into nyc-dev

Browse Source
This commit is contained in:
Keisuke Kuroyanagi
2016-04-20 09:12:50 +00:00
committed by Android (Google) Code Review
parent 0fb51357af abb12ed4f2
commit da067dcbf2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/input/PersistentDataStore.java
View File

@@ -25,6 +25,7 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer; import org.xmlpull.v1.XmlSerializer;
import android.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import android.hardware.input.TouchCalibration; import android.hardware.input.TouchCalibration;
import android.text.TextUtils; import android.text.TextUtils;
@@ -342,6 +343,7 @@ final class PersistentDataStore {
"x_ymix", "x_offset", "y_xmix", "y_scale", "y_offset" }; "x_ymix", "x_offset", "y_xmix", "y_scale", "y_offset" };
private TouchCalibration[] mTouchCalibration = new TouchCalibration[4]; private TouchCalibration[] mTouchCalibration = new TouchCalibration[4];
@Nullable
private String mCurrentKeyboardLayout; private String mCurrentKeyboardLayout;
private List<String> mUnassociatedKeyboardLayouts = new ArrayList<>(); private List<String> mUnassociatedKeyboardLayouts = new ArrayList<>();
private ArrayMap<InputMethodSubtypeHandle, String> mKeyboardLayouts = new ArrayMap<>(); private ArrayMap<InputMethodSubtypeHandle, String> mKeyboardLayouts = new ArrayMap<>();
@@ -368,6 +370,7 @@ final class PersistentDataStore {
} }
} }
@Nullable
public String getCurrentKeyboardLayout() { public String getCurrentKeyboardLayout() {
return mCurrentKeyboardLayout; return mCurrentKeyboardLayout;
} }
@@ -443,7 +446,7 @@ final class PersistentDataStore {
public boolean switchKeyboardLayout(InputMethodSubtypeHandle imeHandle) { public boolean switchKeyboardLayout(InputMethodSubtypeHandle imeHandle) {
final String layout = mKeyboardLayouts.get(imeHandle); final String layout = mKeyboardLayouts.get(imeHandle);
if (layout != null && !TextUtils.equals(mCurrentKeyboardLayout, layout)) { if (!TextUtils.equals(mCurrentKeyboardLayout, layout)) {
mCurrentKeyboardLayout = layout; mCurrentKeyboardLayout = layout;
return true; return true;
} }