From c8da2e13a5f2d81862c51cc06248b4563fefbede Mon Sep 17 00:00:00 2001
From: Abodunrinwa Toki <toki@google.com>
Date: Tue, 26 Jan 2016 20:23:42 +0000
Subject: [PATCH] Settings app: Remove "Toggle keyboard shortcuts helper"
 button

Change-Id: I93bd51a05a8922e02e4e09add94d247442f67334
---
 res/values/strings.xml                           |  2 --
 res/xml/physical_keyboard_settings.xml           |  6 ------
 .../inputmethod/PhysicalKeyboardFragment.java    | 16 ----------------
 3 files changed, 24 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89c05ad81ba..a3bb74a09ae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3555,8 +3555,6 @@
     <string name="show_ime">Show virtual keyboard</string>
     <!-- Summary text for the 'add virtual keyboard' preference sub-screen. [CHAR LIMIT=100] -->
     <string name="show_ime_summary">Keep it on screen while physical keyboard is active</string>
-    <!-- Title for the button to trigger the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=35] -->
-    <string name="keyboard_shortcuts_helper">Keyboard shortcuts helper</string>
     <!--
         Format string for a physical device in the form: InputMethodSubtype - InputMethodEditor.
         e.g. English (US) - X Keyboard -->
diff --git a/res/xml/physical_keyboard_settings.xml b/res/xml/physical_keyboard_settings.xml
index cbb95c2fd58..35f3f04b53d 100644
--- a/res/xml/physical_keyboard_settings.xml
+++ b/res/xml/physical_keyboard_settings.xml
@@ -25,11 +25,5 @@
             android:title="@string/show_ime"
             android:summary="@string/show_ime_summary"
             android:defaultValue="false" />
-
-        <!-- TODO: Get summary text from UX -->
-        <Preference
-            android:key="keyboard_shortcuts_helper"
-            android:title="@string/keyboard_shortcuts_helper"
-            android:summary="@null" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index 74d474c45e1..0a6192e4181 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -38,8 +38,6 @@ import android.view.InputDevice;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
-import android.widget.Toast;
-
 import com.android.internal.inputmethod.InputMethodUtils;
 import com.android.internal.util.Preconditions;
 import com.android.settings.R;
@@ -59,7 +57,6 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
     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";
     private static final String IM_SUBTYPE_MODE_KEYBOARD = "keyboard";
 
     private final HashMap<Integer, Pair<InputDeviceIdentifier, PreferenceCategory>> mLoaderReference
@@ -88,14 +85,6 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
         mShowVirtualKeyboardSwitch = Preconditions.checkNotNull(
                 (SwitchPreference) mKeyboardAssistanceCategory.findPreference(
                         SHOW_VIRTUAL_KEYBOARD_SWITCH));
-        findPreference(KEYBOARD_SHORTCUTS_HELPER).setOnPreferenceClickListener(
-                new Preference.OnPreferenceClickListener() {
-                    @Override
-                    public boolean onPreferenceClick(Preference preference) {
-                        toggleKeyboardShortcutsMenu();
-                        return true;
-                    }
-                });
     }
 
     @Override
@@ -254,11 +243,6 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
         mShowVirtualKeyboardSwitch.setChecked(mSettings.isShowImeWithHardKeyboardEnabled());
     }
 
-    private void toggleKeyboardShortcutsMenu() {
-        // TODO: Implement.
-        Toast.makeText(getActivity(), "toggleKeyboardShortcutsMenu", Toast.LENGTH_SHORT).show();
-    }
-
     private final OnPreferenceChangeListener mShowVirtualKeyboardSwitchPreferenceChangeListener =
             new OnPreferenceChangeListener() {
                 @Override