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 55c60ce3e..ac6c37f55 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,6 +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_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"; public static final String NAME_ZWNJ_KEY = "zwnj_key"; @@ -79,6 +80,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_INCOGNITO_KEY, R.styleable.Keyboard_iconIncognitoKey, NAME_SPACE_KEY_FOR_NUMBER_LAYOUT, R.styleable.Keyboard_iconSpaceKeyForNumberLayout, NAME_SHIFT_KEY_SHIFTED, R.styleable.Keyboard_iconShiftKeyShifted, NAME_SHORTCUT_KEY_DISABLED, R.styleable.Keyboard_iconShortcutKeyDisabled, 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 5d21295e1..636fcbd37 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 @@ -69,6 +69,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick private final ViewGroup mSuggestionsStrip; private final ImageButton mVoiceKey; + private final ImageButton mOtherKey; private final View mImportantNoticeStrip; MainKeyboardView mMainKeyboardView; @@ -141,6 +142,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick mSuggestionsStrip = findViewById(R.id.suggestions_strip); mVoiceKey = findViewById(R.id.suggestions_strip_voice_key); + mOtherKey = findViewById(R.id.suggestions_strip_other_key); mImportantNoticeStrip = findViewById(R.id.important_notice_strip); mStripVisibilityGroup = new StripVisibilityGroup(this, mSuggestionsStrip, mImportantNoticeStrip); @@ -176,9 +178,12 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick final TypedArray keyboardAttr = context.obtainStyledAttributes(attrs, 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); keyboardAttr.recycle(); mVoiceKey.setImageDrawable(iconVoice); mVoiceKey.setOnClickListener(this); + + mOtherKey.setImageDrawable(iconIncognito); } /** @@ -195,6 +200,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick setVisibility(visibility); final SettingsValues currentSettingsValues = Settings.getInstance().getCurrent(); mVoiceKey.setVisibility(currentSettingsValues.mShowsVoiceInputKey ? VISIBLE : INVISIBLE); + mOtherKey.setVisibility(currentSettingsValues.mIncognitoModeEnabled ? VISIBLE : INVISIBLE); } public void setSuggestions(final SuggestedWords suggestedWords, final boolean isRtlLanguage) { diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_incognito_dark.png b/app/src/main/res/drawable-hdpi/sym_keyboard_incognito_dark.png new file mode 100644 index 000000000..ef82fdd92 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/sym_keyboard_incognito_dark.png differ diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_incognito_light.png b/app/src/main/res/drawable-hdpi/sym_keyboard_incognito_light.png new file mode 100644 index 000000000..2b7d5500f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/sym_keyboard_incognito_light.png differ diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_incognito_dark.png b/app/src/main/res/drawable-mdpi/sym_keyboard_incognito_dark.png new file mode 100644 index 000000000..8630613af Binary files /dev/null and b/app/src/main/res/drawable-mdpi/sym_keyboard_incognito_dark.png differ diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_incognito_light.png b/app/src/main/res/drawable-mdpi/sym_keyboard_incognito_light.png new file mode 100644 index 000000000..d8bdcc790 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/sym_keyboard_incognito_light.png differ diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_incognito_dark.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_incognito_dark.png new file mode 100644 index 000000000..9417b5b7d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_incognito_dark.png differ diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_incognito_light.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_incognito_light.png new file mode 100644 index 000000000..19ae3094c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_incognito_light.png differ diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_incognito_dark.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_incognito_dark.png new file mode 100644 index 000000000..2ef22d255 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_incognito_dark.png differ diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_incognito_light.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_incognito_light.png new file mode 100644 index 000000000..8a43b20f8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_incognito_light.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_incognito_dark.png b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_incognito_dark.png new file mode 100644 index 000000000..cce13ccd4 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_incognito_dark.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_incognito_light.png b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_incognito_light.png new file mode 100644 index 000000000..d18fa9228 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_incognito_light.png differ diff --git a/app/src/main/res/layout/suggestions_strip.xml b/app/src/main/res/layout/suggestions_strip.xml index 47e9a918e..80530204e 100644 --- a/app/src/main/res/layout/suggestions_strip.xml +++ b/app/src/main/res/layout/suggestions_strip.xml @@ -33,8 +33,14 @@ android:soundEffectsEnabled="false" /> - + + diff --git a/app/src/main/res/values/keyboard-icons-holo.xml b/app/src/main/res/values/keyboard-icons-holo.xml index fa913b830..5ef52f264 100644 --- a/app/src/main/res/values/keyboard-icons-holo.xml +++ b/app/src/main/res/values/keyboard-icons-holo.xml @@ -29,6 +29,7 @@ @drawable/sym_keyboard_search_holo_dark @drawable/sym_keyboard_tab_holo_dark @drawable/sym_keyboard_voice_holo_dark + @drawable/sym_keyboard_incognito_dark @drawable/sym_keyboard_space_holo_dark @drawable/sym_keyboard_shift_locked_holo_dark @drawable/sym_keyboard_voice_off_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 93e38664e..a28705a9f 100644 --- a/app/src/main/res/values/keyboard-icons-lxx-dark.xml +++ b/app/src/main/res/values/keyboard-icons-lxx-dark.xml @@ -34,6 +34,7 @@ @drawable/sym_keyboard_previous_lxx_dark @drawable/sym_keyboard_tab_lxx_dark @drawable/sym_keyboard_voice_lxx_dark + @drawable/sym_keyboard_incognito_dark @drawable/sym_keyboard_space_lxx_dark @drawable/sym_keyboard_shift_locked_lxx_dark @drawable/sym_keyboard_voice_off_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 5333d7223..4e5fbb3d0 100644 --- a/app/src/main/res/values/keyboard-icons-lxx-light.xml +++ b/app/src/main/res/values/keyboard-icons-lxx-light.xml @@ -34,6 +34,7 @@ @drawable/sym_keyboard_previous_lxx_light @drawable/sym_keyboard_tab_lxx_light @drawable/sym_keyboard_voice_lxx_light + @drawable/sym_keyboard_incognito_light @drawable/sym_keyboard_space_lxx_light @drawable/sym_keyboard_shift_locked_lxx_light @drawable/sym_keyboard_voice_off_lxx_light diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a31f58154..5140accc5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -606,4 +606,5 @@ Tip: You can download and remove dictionaries by going to <b>Languages & Space bar trackpad Perform a swipe from the delete key to select and remove bigger portions of text at once Swipe on the spacebar to move the cursor + More keys