update strings and clarify names

This commit is contained in:
Helium 2022-03-21 15:09:39 +01:00
parent 2197ffd4a5
commit 8f1d2ef489
5 changed files with 11 additions and 11 deletions

View file

@ -1003,7 +1003,7 @@ public final class InputLogic {
// phantom space state when typing decimal numbers, with the drawback of not // phantom space state when typing decimal numbers, with the drawback of not
// setting phantom space state after ending a sentence with a non-word. // setting phantom space state after ending a sentence with a non-word.
if (wasComposingWord if (wasComposingWord
&& settingsValues.mInsertMoreSpacesEnabled && settingsValues.mAutospaceAfterPunctuationEnabled
&& settingsValues.isUsuallyFollowedBySpace(codePoint)) { && settingsValues.isUsuallyFollowedBySpace(codePoint)) {
mSpaceState = SpaceState.PHANTOM; mSpaceState = SpaceState.PHANTOM;
} }

View file

@ -94,7 +94,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
public static final String PREF_KEYBOARD_HEIGHT_SCALE = "pref_keyboard_height_scale"; public static final String PREF_KEYBOARD_HEIGHT_SCALE = "pref_keyboard_height_scale";
public static final String PREF_SPACE_TRACKPAD = "pref_space_trackpad"; public static final String PREF_SPACE_TRACKPAD = "pref_space_trackpad";
public static final String PREF_DELETE_SWIPE = "pref_delete_swipe"; public static final String PREF_DELETE_SWIPE = "pref_delete_swipe";
public static final String PREF_INSERT_MORE_SPACES = "pref_insert_more_spaces"; public static final String PREF_AUTOSPACE_AFTER_PUNCTUATION = "pref_autospace_after_punctuation";
public static final String PREF_ALWAYS_INCOGNITO_MODE = public static final String PREF_ALWAYS_INCOGNITO_MODE =
"pref_always_incognito_mode"; "pref_always_incognito_mode";
public static final String PREF_BIGRAM_PREDICTIONS = "next_word_prediction"; public static final String PREF_BIGRAM_PREDICTIONS = "next_word_prediction";
@ -393,8 +393,8 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
return prefs.getBoolean(PREF_DELETE_SWIPE, true); return prefs.getBoolean(PREF_DELETE_SWIPE, true);
} }
public static boolean readInsertMoreSpacesEnabled(final SharedPreferences prefs) { public static boolean readAutospaceAfterPunctuationEnabled(final SharedPreferences prefs) {
return prefs.getBoolean(PREF_INSERT_MORE_SPACES, false); return prefs.getBoolean(PREF_AUTOSPACE_AFTER_PUNCTUATION, false);
} }
public static boolean readUseFullscreenMode(final Resources res) { public static boolean readUseFullscreenMode(final Resources res) {

View file

@ -80,7 +80,7 @@ public class SettingsValues {
public final boolean mBlockPotentiallyOffensive; public final boolean mBlockPotentiallyOffensive;
public final boolean mSpaceTrackpadEnabled; public final boolean mSpaceTrackpadEnabled;
public final boolean mDeleteSwipeEnabled; public final boolean mDeleteSwipeEnabled;
public final boolean mInsertMoreSpacesEnabled; public final boolean mAutospaceAfterPunctuationEnabled;
public final boolean mClipboardHistoryEnabled; public final boolean mClipboardHistoryEnabled;
public final long mClipboardHistoryRetentionTime; public final long mClipboardHistoryRetentionTime;
public final boolean mOneHandedModeEnabled; public final boolean mOneHandedModeEnabled;
@ -238,7 +238,7 @@ public class SettingsValues {
} }
mSpaceTrackpadEnabled = Settings.readSpaceTrackpadEnabled(prefs); mSpaceTrackpadEnabled = Settings.readSpaceTrackpadEnabled(prefs);
mDeleteSwipeEnabled = Settings.readDeleteSwipeEnabled(prefs); mDeleteSwipeEnabled = Settings.readDeleteSwipeEnabled(prefs);
mInsertMoreSpacesEnabled = Settings.readInsertMoreSpacesEnabled(prefs); mAutospaceAfterPunctuationEnabled = Settings.readAutospaceAfterPunctuationEnabled(prefs);
mClipboardHistoryEnabled = Settings.readClipboardHistoryEnabled(prefs); mClipboardHistoryEnabled = Settings.readClipboardHistoryEnabled(prefs);
mClipboardHistoryRetentionTime = Settings.readClipboardHistoryRetentionTime(prefs, res); mClipboardHistoryRetentionTime = Settings.readClipboardHistoryRetentionTime(prefs, res);
mOneHandedModeEnabled = Settings.readOneHandedModeEnabled(prefs); mOneHandedModeEnabled = Settings.readOneHandedModeEnabled(prefs);

View file

@ -187,9 +187,9 @@
<!-- Description for "space_trackpad" option. --> <!-- Description for "space_trackpad" option. -->
<string name="space_trackpad_summary">Swipe on the spacebar to move the cursor</string> <string name="space_trackpad_summary">Swipe on the spacebar to move the cursor</string>
<!-- Preferences item for enabling inserting more spaces key --> <!-- Preferences item for enabling inserting more spaces key -->
<string name="insert_more_spaces">Insert spaces after punctuation</string> <string name="autospace_after_punctuation">Autospace after punctuation</string>
<!-- Description for "insert_more_spaces" option. --> <!-- Description for "insert_more_spaces" option. -->
<string name="insert_more_spaces_summary">Automatically insert space after punctuation, even if the previous word was not a suggestion</string> <string name="autospace_after_punctuation_summary">Automatically insert space after punctuation when typing a new word</string>
<!-- Preferences item for disabling word learning --> <!-- Preferences item for disabling word learning -->
<string name="prefs_force_incognito_mode">Force incognito mode</string> <string name="prefs_force_incognito_mode">Force incognito mode</string>
<!-- Description for "prefs_force_incognito_mode" option. --> <!-- Description for "prefs_force_incognito_mode" option. -->

View file

@ -77,9 +77,9 @@
android:defaultValue="true" /> android:defaultValue="true" />
<CheckBoxPreference <CheckBoxPreference
android:key="pref_insert_more_spaces" android:key="pref_autospace_after_punctuation"
android:title="@string/insert_more_spaces" android:title="@string/autospace_after_punctuation"
android:summary="@string/insert_more_spaces_summary" android:summary="@string/autospace_after_punctuation_summary"
android:defaultValue="false" /> android:defaultValue="false" />
</PreferenceCategory> </PreferenceCategory>