Skip to content

Commit

Permalink
Bring back some physical keyboard settings
Browse files Browse the repository at this point in the history 
These preferences were originally in AOSP, but they were then removed
and we brought them back with 572f90b
("Settings: Add toggles for several CM additions"). So they are not
our addition as commit 5aa2f34
("Settings: Add toggles for several CM additions") implies and they
are currently dummy switches. Bring back the code needed to handle
these preferences.

Please note that these preferences simply control whether the current
on-screen keypad can or cannot process hard keyboard events.

BUGBASH-761

Change-Id: I4e90e009a998fadfcbd48b07aa9ad3164a01cb1a
  • Loading branch information
@Klozz
Gabriele M authored and Klozz committed Jul 13, 2017
1 parent 4438d41 commit a3b7a60
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 18 deletions.
36 changes: 18 additions & 18 deletions res/xml/physical_keyboard_settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,25 @@
android:title="@string/keyboard_shortcuts_helper"
android:summary="@string/keyboard_shortcuts_helper_summary" />

<cyanogenmod.preference.SystemSettingSwitchPreference
android:key="auto_replace"
android:title="@string/auto_replace"
android:summaryOn="@string/auto_replace_summary"
android:summaryOff="@string/auto_replace_summary"
android:persistent="false" />
<SwitchPreference
android:key="auto_replace"
android:title="@string/auto_replace"
android:summaryOn="@string/auto_replace_summary"
android:summaryOff="@string/auto_replace_summary"
android:persistent="false" />

<cyanogenmod.preference.SystemSettingSwitchPreference
android:key="auto_caps"
android:title="@string/auto_caps"
android:summaryOn="@string/auto_caps_summary"
android:summaryOff="@string/auto_caps_summary"
android:persistent="false" />
<SwitchPreference
android:key="auto_caps"
android:title="@string/auto_caps"
android:summaryOn="@string/auto_caps_summary"
android:summaryOff="@string/auto_caps_summary"
android:persistent="false" />

<cyanogenmod.preference.SystemSettingSwitchPreference
android:key="auto_punctuate"
android:title="@string/auto_punctuate"
android:summaryOn="@string/auto_punctuate_summary"
android:summaryOff="@string/auto_punctuate_summary"
android:persistent="false" />
<SwitchPreference
android:key="auto_punctuate"
android:title="@string/auto_punctuate"
android:summaryOn="@string/auto_punctuate_summary"
android:summaryOff="@string/auto_punctuate_summary"
android:persistent="false" />
</PreferenceCategory>
</PreferenceScreen>
44 changes: 44 additions & 0 deletions src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings.Secure;
import android.provider.Settings.System;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
Expand Down Expand Up @@ -65,6 +66,9 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
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 static final String AUTO_REPLACE_SWITCH = "auto_replace";
private static final String AUTO_CAPS_SWITCH = "auto_caps";
private static final String AUTO_PUNCTUATE_SWITCH = "auto_punctuate";

@NonNull
private final List<HardKeyboardDeviceInfo> mLastHardKeyboards = new ArrayList<>();
Expand Down Expand Up @@ -108,6 +112,46 @@ public boolean onPreferenceClick(Preference preference) {
return true;
}
});

Preference.OnPreferenceClickListener textPreferenceClickListener =
new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
SwitchPreference pref = (SwitchPreference) preference;
if (AUTO_REPLACE_SWITCH.equals(pref.getKey())) {
System.putInt(getContentResolver(), System.TEXT_AUTO_REPLACE,
pref.isChecked() ? 1 : 0);
} else if (AUTO_CAPS_SWITCH.equals(pref.getKey())) {
System.putInt(getContentResolver(), System.TEXT_AUTO_CAPS,
pref.isChecked() ? 1 : 0);
} else if (AUTO_PUNCTUATE_SWITCH.equals(pref.getKey())) {
System.putInt(getContentResolver(), System.TEXT_AUTO_PUNCTUATE,
pref.isChecked() ? 1 : 0);
}
return true;
}
};

SwitchPreference autoReplaceSwitch = Preconditions.checkNotNull(
(SwitchPreference) mKeyboardAssistanceCategory.findPreference(
AUTO_REPLACE_SWITCH));
autoReplaceSwitch.setChecked(System.getInt(getContentResolver(),
System.TEXT_AUTO_REPLACE, 1) > 0);
autoReplaceSwitch.setOnPreferenceClickListener(textPreferenceClickListener);

SwitchPreference autoCapsSwitch = Preconditions.checkNotNull(
(SwitchPreference) mKeyboardAssistanceCategory.findPreference(
AUTO_CAPS_SWITCH));
autoCapsSwitch.setChecked(System.getInt(getContentResolver(),
System.TEXT_AUTO_CAPS, 1) > 0);
autoCapsSwitch.setOnPreferenceClickListener(textPreferenceClickListener);

SwitchPreference autoPunctuateSwitch = Preconditions.checkNotNull(
(SwitchPreference) mKeyboardAssistanceCategory.findPreference(
AUTO_PUNCTUATE_SWITCH));
autoPunctuateSwitch.setChecked(System.getInt(getContentResolver(),
System.TEXT_AUTO_PUNCTUATE, 1) > 0);
autoPunctuateSwitch.setOnPreferenceClickListener(textPreferenceClickListener);
}

@Override
Expand Down

0 comments on commit a3b7a60

Please sign in to comment.