From e0f95aa5c9b5d06b6bbe742545e9121fec6336a9 Mon Sep 17 00:00:00 2001 From: Trevor Terris Date: Mon, 22 Nov 2021 08:12:17 -0500 Subject: [PATCH] Renamed variables from "paste" to "clipboard" --- .../keyboard/internal/KeyboardIconsSet.java | 4 ++-- .../openboard/inputmethod/latin/LatinIME.java | 4 ++-- .../inputmethod/latin/settings/Settings.java | 6 +++--- .../latin/settings/SettingsValues.java | 4 ++-- .../latin/suggestions/SuggestionStripView.java | 18 +++++++++--------- ...ark.xml => sym_keyboard_clipboard_dark.xml} | 0 ...ht.xml => sym_keyboard_clipboard_light.xml} | 0 app/src/main/res/layout/suggestions_strip.xml | 2 +- .../res/values-v31/keyboard-icons-lxx-dark.xml | 2 +- .../values-v31/keyboard-icons-lxx-light.xml | 2 +- app/src/main/res/values/attrs.xml | 2 +- .../main/res/values/keyboard-icons-holo.xml | 2 +- .../res/values/keyboard-icons-lxx-dark.xml | 2 +- .../res/values/keyboard-icons-lxx-light.xml | 2 +- app/src/main/res/values/strings.xml | 4 ++-- .../main/res/xml/prefs_screen_preferences.xml | 6 +++--- 16 files changed, 30 insertions(+), 30 deletions(-) rename app/src/main/res/drawable/{sym_keyboard_paste_dark.xml => sym_keyboard_clipboard_dark.xml} (100%) rename app/src/main/res/drawable/{sym_keyboard_paste_light.xml => sym_keyboard_clipboard_light.xml} (100%) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardIconsSet.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardIconsSet.java index bbe8b3214..5e2430a4f 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardIconsSet.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardIconsSet.java @@ -52,7 +52,7 @@ public final class KeyboardIconsSet { public static final String NAME_PREVIOUS_KEY = "previous_key"; public static final String NAME_TAB_KEY = "tab_key"; public static final String NAME_SHORTCUT_KEY = "shortcut_key"; - public static final String NAME_PASTE_KEY = "paste_key"; + public static final String NAME_CLIPBOARD_KEY = "clipboard_key"; public static final String NAME_INCOGNITO_KEY = "incognito_key"; public static final String NAME_SHORTCUT_KEY_DISABLED = "shortcut_key_disabled"; public static final String NAME_LANGUAGE_SWITCH_KEY = "language_switch_key"; @@ -81,7 +81,7 @@ public final class KeyboardIconsSet { NAME_PREVIOUS_KEY, R.styleable.Keyboard_iconPreviousKey, NAME_TAB_KEY, R.styleable.Keyboard_iconTabKey, NAME_SHORTCUT_KEY, R.styleable.Keyboard_iconShortcutKey, - NAME_PASTE_KEY, R.styleable.Keyboard_iconPasteKey, + NAME_CLIPBOARD_KEY, R.styleable.Keyboard_iconClipboardKey, NAME_INCOGNITO_KEY, R.styleable.Keyboard_iconIncognitoKey, NAME_SPACE_KEY_FOR_NUMBER_LAYOUT, R.styleable.Keyboard_iconSpaceKeyForNumberLayout, NAME_SHIFT_KEY_SHIFTED, R.styleable.Keyboard_iconShiftKeyShifted, diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/LatinIME.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/LatinIME.java index d789d58ca..1285380d0 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/LatinIME.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/LatinIME.java @@ -1588,11 +1588,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen currentSettingsValues.mInputAttributes.mShouldShowSuggestions && currentSettingsValues.isSuggestionsEnabledPerUserSettings(); final boolean shouldShowSuggestionsStripUnlessPassword = currentSettingsValues.mShowsVoiceInputKey - || currentSettingsValues.mShowsPasteKey + || currentSettingsValues.mShowsClipboardKey || shouldShowSuggestionCandidates || currentSettingsValues.isApplicationSpecifiedCompletionsOn(); final boolean shouldShowSuggestionsStrip = shouldShowSuggestionsStripUnlessPassword - && (!currentSettingsValues.mInputAttributes.mIsPasswordField || currentSettingsValues.mShowsPasteKey); + && (!currentSettingsValues.mInputAttributes.mIsPasswordField || currentSettingsValues.mShowsClipboardKey); mSuggestionStripView.updateVisibility(shouldShowSuggestionsStrip, isFullscreenMode()); if (!shouldShowSuggestionsStrip) { return; diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java index dcd39acba..6522d5d7e 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java @@ -56,7 +56,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang // PREF_VOICE_MODE_OBSOLETE is obsolete. Use PREF_VOICE_INPUT_KEY instead. public static final String PREF_VOICE_MODE_OBSOLETE = "voice_mode"; public static final String PREF_VOICE_INPUT_KEY = "pref_voice_input_key"; - public static final String PREF_CLIPBOARD_PASTE_KEY = "pref_clipboard_paste_key"; + public static final String PREF_CLIPBOARD_CLIPBOARD_KEY = "pref_clipboard_clipboard_key"; public static final String PREF_EDIT_PERSONAL_DICTIONARY = "edit_personal_dictionary"; // PREF_AUTO_CORRECTION_THRESHOLD_OBSOLETE is obsolete. Use PREF_AUTO_CORRECTION instead. public static final String PREF_AUTO_CORRECTION_THRESHOLD_OBSOLETE = @@ -78,8 +78,8 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang "pref_show_language_switch_key"; public static final String PREF_SHOW_EMOJI_KEY = "pref_show_emoji_key"; - public static final String PREF_SHOW_PASTE_KEY = - "pref_show_paste_key"; + public static final String PREF_SHOW_CLIPBOARD_KEY = + "pref_show_clipboard_key"; public static final String PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST = "pref_include_other_imes_in_language_switch_list"; public static final String PREF_CUSTOM_INPUT_STYLES = "custom_input_styles"; diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java index 95dd4325b..9b51962e2 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java @@ -73,7 +73,7 @@ public class SettingsValues { public final boolean mShowsHints; public final boolean mShowsLanguageSwitchKey; public final boolean mShowsEmojiKey; - public final boolean mShowsPasteKey; + public final boolean mShowsClipboardKey; public final boolean mUsePersonalizedDicts; public final boolean mUseDoubleSpacePeriod; public final boolean mBlockPotentiallyOffensive; @@ -150,7 +150,7 @@ public class SettingsValues { mShowsHints = prefs.getBoolean(Settings.PREF_SHOW_HINTS, true); mShowsLanguageSwitchKey = prefs.getBoolean(Settings.PREF_SHOW_LANGUAGE_SWITCH_KEY, false); mShowsEmojiKey = prefs.getBoolean(Settings.PREF_SHOW_EMOJI_KEY, false); - mShowsPasteKey = prefs.getBoolean(Settings.PREF_SHOW_PASTE_KEY, false); + mShowsClipboardKey = prefs.getBoolean(Settings.PREF_SHOW_CLIPBOARD_KEY, false); mUsePersonalizedDicts = prefs.getBoolean(Settings.PREF_KEY_USE_PERSONALIZED_DICTS, true); mUseDoubleSpacePeriod = prefs.getBoolean(Settings.PREF_KEY_USE_DOUBLE_SPACE_PERIOD, true) && inputAttributes.mIsGeneralTextInput; diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java index c636b0af0..e2c1a2e0c 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java @@ -70,7 +70,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick private final ViewGroup mSuggestionsStrip; private final ImageButton mVoiceKey; - private final ImageButton mPasteKey; + private final ImageButton mClipboardKey; private final ImageButton mOtherKey; MainKeyboardView mMainKeyboardView; @@ -131,7 +131,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick mSuggestionsStrip = findViewById(R.id.suggestions_strip); mVoiceKey = findViewById(R.id.suggestions_strip_voice_key); - mPasteKey = findViewById(R.id.suggestions_strip_paste_key); + mClipboardKey = findViewById(R.id.suggestions_strip_clipboard_key); mOtherKey = findViewById(R.id.suggestions_strip_other_key); mStripVisibilityGroup = new StripVisibilityGroup(this, mSuggestionsStrip); @@ -167,13 +167,13 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick R.styleable.Keyboard, defStyle, R.style.SuggestionStripView); final Drawable iconVoice = keyboardAttr.getDrawable(R.styleable.Keyboard_iconShortcutKey); final Drawable iconIncognito = keyboardAttr.getDrawable(R.styleable.Keyboard_iconIncognitoKey); - final Drawable iconPaste = keyboardAttr.getDrawable(R.styleable.Keyboard_iconPasteKey); + final Drawable iconClipboard = keyboardAttr.getDrawable(R.styleable.Keyboard_iconClipboardKey); keyboardAttr.recycle(); mVoiceKey.setImageDrawable(iconVoice); mVoiceKey.setOnClickListener(this); - mPasteKey.setImageDrawable(iconPaste); - mPasteKey.setOnClickListener(this); - mPasteKey.setOnLongClickListener(this); + mClipboardKey.setImageDrawable(iconClipboard); + mClipboardKey.setOnClickListener(this); + mClipboardKey.setOnLongClickListener(this); mOtherKey.setImageDrawable(iconIncognito); } @@ -192,7 +192,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick setVisibility(visibility); final SettingsValues currentSettingsValues = Settings.getInstance().getCurrent(); mVoiceKey.setVisibility(currentSettingsValues.mShowsVoiceInputKey ? VISIBLE : GONE); - mPasteKey.setVisibility(currentSettingsValues.mShowsPasteKey ? VISIBLE : (mVoiceKey.getVisibility() == GONE ? INVISIBLE : GONE)); + mClipboardKey.setVisibility(currentSettingsValues.mShowsClipboardKey ? VISIBLE : (mVoiceKey.getVisibility() == GONE ? INVISIBLE : GONE)); mOtherKey.setVisibility(currentSettingsValues.mIncognitoModeEnabled ? VISIBLE : INVISIBLE); } @@ -267,7 +267,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick @Override public boolean onLongClick(final View view) { - if (view == mPasteKey) { + if (view == mClipboardKey) { ClipboardManager clipboardManager = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE); ClipData clipData = clipboardManager.getPrimaryClip(); if (clipData != null && clipData.getItemCount() > 0 && clipData.getItemAt(0) != null) { @@ -441,7 +441,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick false /* isKeyRepeat */); return; } - if (view == mPasteKey) { + if (view == mClipboardKey) { CharSequence selectionSequence = mListener.getSelection(); if (selectionSequence != null && selectionSequence.length() > 0 && !Settings.getInstance().getCurrent().mInputAttributes.mIsPasswordField) { diff --git a/app/src/main/res/drawable/sym_keyboard_paste_dark.xml b/app/src/main/res/drawable/sym_keyboard_clipboard_dark.xml similarity index 100% rename from app/src/main/res/drawable/sym_keyboard_paste_dark.xml rename to app/src/main/res/drawable/sym_keyboard_clipboard_dark.xml diff --git a/app/src/main/res/drawable/sym_keyboard_paste_light.xml b/app/src/main/res/drawable/sym_keyboard_clipboard_light.xml similarity index 100% rename from app/src/main/res/drawable/sym_keyboard_paste_light.xml rename to app/src/main/res/drawable/sym_keyboard_clipboard_light.xml diff --git a/app/src/main/res/layout/suggestions_strip.xml b/app/src/main/res/layout/suggestions_strip.xml index 7fcc1e314..7f98671b5 100644 --- a/app/src/main/res/layout/suggestions_strip.xml +++ b/app/src/main/res/layout/suggestions_strip.xml @@ -54,7 +54,7 @@ android:contentDescription="@string/spoken_description_mic" style="?attr/suggestionWordStyle" /> @drawable/sym_keyboard_previous_lxx_dark @drawable/sym_keyboard_voice_lxx_dark @drawable/sym_keyboard_voice_off_lxx_dark - @drawable/sym_keyboard_paste_dark + @drawable/sym_keyboard_clipboard_dark @drawable/sym_keyboard_incognito_lxx_dark @drawable/sym_keyboard_space_lxx_dark @drawable/sym_keyboard_language_switch_lxx_dark diff --git a/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml b/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml index 80b0d806e..49f17d98e 100644 --- a/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml +++ b/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml @@ -36,7 +36,7 @@ @drawable/sym_keyboard_previous_lxx_light @drawable/sym_keyboard_voice_lxx_light @drawable/sym_keyboard_voice_off_lxx_light - @drawable/sym_keyboard_paste_light + @drawable/sym_keyboard_clipboard_light @drawable/sym_keyboard_incognito_lxx_light @drawable/sym_keyboard_space_lxx_light @drawable/sym_keyboard_language_switch_lxx_light diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 8e7c81f1e..7defaf7dc 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -270,7 +270,7 @@ - + diff --git a/app/src/main/res/values/keyboard-icons-holo.xml b/app/src/main/res/values/keyboard-icons-holo.xml index 31979b1d7..6cec98fc8 100644 --- a/app/src/main/res/values/keyboard-icons-holo.xml +++ b/app/src/main/res/values/keyboard-icons-holo.xml @@ -29,7 +29,7 @@ @drawable/sym_keyboard_search_holo_dark @drawable/sym_keyboard_tab_holo_dark @drawable/sym_keyboard_voice_holo_dark - @drawable/sym_keyboard_paste_dark + @drawable/sym_keyboard_clipboard_dark @drawable/sym_keyboard_incognito_dark @drawable/sym_keyboard_space_holo_dark @drawable/sym_keyboard_shift_locked_holo_dark diff --git a/app/src/main/res/values/keyboard-icons-lxx-dark.xml b/app/src/main/res/values/keyboard-icons-lxx-dark.xml index 9d86ec679..2a5d181e8 100644 --- a/app/src/main/res/values/keyboard-icons-lxx-dark.xml +++ b/app/src/main/res/values/keyboard-icons-lxx-dark.xml @@ -36,7 +36,7 @@ @drawable/sym_keyboard_previous_lxx_dark @drawable/sym_keyboard_voice_lxx_dark @drawable/sym_keyboard_voice_off_lxx_dark - @drawable/sym_keyboard_paste_dark + @drawable/sym_keyboard_clipboard_dark @drawable/sym_keyboard_incognito_lxx_dark @drawable/sym_keyboard_space_lxx_dark @drawable/sym_keyboard_language_switch_lxx_dark diff --git a/app/src/main/res/values/keyboard-icons-lxx-light.xml b/app/src/main/res/values/keyboard-icons-lxx-light.xml index f240b8b7f..89c8aa9cd 100644 --- a/app/src/main/res/values/keyboard-icons-lxx-light.xml +++ b/app/src/main/res/values/keyboard-icons-lxx-light.xml @@ -36,7 +36,7 @@ @drawable/sym_keyboard_previous_lxx_light @drawable/sym_keyboard_voice_lxx_light @drawable/sym_keyboard_voice_off_lxx_light - @drawable/sym_keyboard_paste_light + @drawable/sym_keyboard_clipboard_light @drawable/sym_keyboard_incognito_lxx_light @drawable/sym_keyboard_space_lxx_light @drawable/sym_keyboard_language_switch_lxx_light diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d1e6901a8..22285205f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -180,8 +180,8 @@ No voice input methods enabled. Check Languages & input settings. - Clipboard paste key - Press to copy, long-press to paste. + Clipboard key + Press to copy, long-press to paste. Configure input methods diff --git a/app/src/main/res/xml/prefs_screen_preferences.xml b/app/src/main/res/xml/prefs_screen_preferences.xml index 7015894db..1a3a869bf 100644 --- a/app/src/main/res/xml/prefs_screen_preferences.xml +++ b/app/src/main/res/xml/prefs_screen_preferences.xml @@ -72,9 +72,9 @@ android:defaultValue="true" android:persistent="true" />