From 611410a8c4b55b0fc6fde3e718f028335dea41d8 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Wed, 30 Mar 2016 11:40:30 -0700 Subject: [PATCH 1/2] Update title to "Add or edit virtual keyboards". Per comment from UX, we replace "Add virtual keyboard" with "Add or edit virtual keyboards" because the user is able to not only enable but also disable virtual keyboards. Bug: 27543291 Change-Id: Id2ae61519152bbe622aa5915f728a4cbbc49e078 --- res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index a1ae9b1858d..8f766322d16 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3618,8 +3618,8 @@ Virtual keyboard Available virtual keyboard - - Add a virtual keyboard + + Add or edit virtual keyboards Keyboard assistance From a9341c38e3a3e38ebf6de1803304026b84d4c15d Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Wed, 30 Mar 2016 11:45:00 -0700 Subject: [PATCH 2/2] Remove gear icon from InputMethodPreference. Per comment from UX, we do not show gear icons on InputMethodPreference because there is no difference between tapping the item itself and tapping the gear icon. Bug: 27543291 Change-Id: Ieea9a13a4b7af9c90c3a2a8f365bd318663998b1 --- .../settings/inputmethod/InputMethodPreference.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java index 3d6e7dced7c..f3737499e9d 100755 --- a/src/com/android/settings/inputmethod/InputMethodPreference.java +++ b/src/com/android/settings/inputmethod/InputMethodPreference.java @@ -55,7 +55,7 @@ class InputMethodPreference extends RestrictedSwitchPreference implements OnPref OnPreferenceChangeListener { private static final String TAG = InputMethodPreference.class.getSimpleName(); private static final String EMPTY_TEXT = ""; - private static final int SETTINGS_ICON_LAYOUT = R.layout.preference_settings_icon_widget; + private static final int NO_WIDGET = 0; interface OnSavePreferenceListener { /** @@ -99,8 +99,8 @@ class InputMethodPreference extends RestrictedSwitchPreference implements OnPref mIsAllowedByOrganization = isAllowedByOrganization; mOnSaveListener = onSaveListener; if (!isImeEnabler) { - // Replace switch widget with settings icon. - setWidgetLayoutResource(SETTINGS_ICON_LAYOUT); + // Remove switch widget. + setWidgetLayoutResource(NO_WIDGET); } // Disable on/off switch texts. setSwitchTextOn(EMPTY_TEXT); @@ -130,7 +130,7 @@ class InputMethodPreference extends RestrictedSwitchPreference implements OnPref private boolean isImeEnabler() { // If this {@link SwitchPreference} doesn't have a widget layout, we explicitly hide the // switch widget at constructor. - return getWidgetLayoutResource() != SETTINGS_ICON_LAYOUT; + return getWidgetLayoutResource() != NO_WIDGET; } @Override