diff --git a/java/Android.bp b/java/Android.bp
index 613b451488881b0cb0fbfd36f366e9d4a2e091f1..12ea76e946dd3f63c864330a44ef18a1733ee8ce 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -45,6 +45,7 @@ android_app {
"jsr305",
"latinime-common",
"androidx.legacy_legacy-support-v4",
+ "elib",
],
// Do not compress dictionary files to mmap dict data runtime
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 8c3bc005f4ae799d4dd37c22901b1346c84a485f..8b02fa595cf457922adde41190260b40b7b232bc 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -19,7 +19,7 @@
package="com.android.inputmethod.latin"
android:versionCode="30">
-
diff --git a/java/res/drawable-night/ic_emoji_activity_you.xml b/java/res/drawable-night/ic_emoji_activity_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b916d4f9e1440c3796251b85d5b465487958f3e9
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_activity_you.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ - @drawable/btn_keyboard_key_you
- @drawable/btn_keyboard_key_functional_you
- @drawable/btn_keyboard_key_you
+ - @drawable/btn_keyboard_key_enter_you
- @color/keyboard_key_text_color_you
- @color/functional_text_color_you
- @color/functional_text_color_you
- @color/key_hint_letter_color_you
- - @color/key_text_inactive_color_lxx_dark
+ - @color/key_hint_letter_color_you
- @color/key_text_inactive_color_lxx_dark
- @color/key_text_color_lxx_dark
- @color/keyboard_key_text_color_you
@@ -113,23 +114,23 @@
- false
- @color/category_page_indicator_color
- @null
- - @drawable/ic_emoji_recents_lxx_dark
- - @drawable/ic_emoji_people_lxx_dark
- - @drawable/ic_emoji_objects_lxx_dark
- - @drawable/ic_emoji_nature_lxx_dark
- - @drawable/ic_emoji_places_lxx_dark
- - @drawable/ic_emoji_symbols_lxx_dark
- - @drawable/ic_emoji_emoticons_lxx_dark
- - @drawable/ic_emoji_flag_lxx_dark
- - @drawable/ic_emoji_people_lxx_dark
- - @drawable/ic_emoji_nature_lxx_dark
- - @drawable/ic_emoji_food_lxx_dark
- - @drawable/ic_emoji_places_lxx_dark
- - @drawable/ic_emoji_activity_lxx_dark
- - @drawable/ic_emoji_objects_lxx_dark
- - @drawable/ic_emoji_symbols_lxx_dark
- - @drawable/ic_emoji_flag_lxx_dark
- - @drawable/ic_emoji_people_lxx_dark
+ - @drawable/ic_emoji_recents_you
+ - @drawable/ic_emoji_people_you
+ - @drawable/ic_emoji_objects_you
+ - @drawable/ic_emoji_nature_you
+ - @drawable/ic_emoji_places_you
+ - @drawable/ic_emoji_symbols_you
+ - @drawable/ic_emoji_emoticons_you
+ - @drawable/ic_emoji_flag_you
+ - @drawable/ic_emoji_people_you
+ - @drawable/ic_emoji_nature_you
+ - @drawable/ic_emoji_food_you
+ - @drawable/ic_emoji_places_you
+ - @drawable/ic_emoji_activity_you
+ - @drawable/ic_emoji_objects_you
+ - @drawable/ic_emoji_symbols_you
+ - @drawable/ic_emoji_flag_you
+ - @drawable/ic_emoji_people_you
diff --git a/java/res/xml/prefs_screen_preferences.xml b/java/res/xml/prefs_screen_preferences.xml
index 101edc8557b62a35c0638c282bb9f43cd756d7e1..540f9f6a6a253dd08345c1eeb5c411ba7e50fb19 100644
--- a/java/res/xml/prefs_screen_preferences.xml
+++ b/java/res/xml/prefs_screen_preferences.xml
@@ -48,6 +48,6 @@
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index 299d1b7c5e347ba9c309000bb81f52b34e90c494..3f85fd16e5594e1cfc52eb717189bf95a22be632 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -156,6 +156,7 @@ public class Key implements Comparable {
public static final int BACKGROUND_TYPE_STICKY_ON = 4;
public static final int BACKGROUND_TYPE_ACTION = 5;
public static final int BACKGROUND_TYPE_SPACEBAR = 6;
+ public static final int BACKGROUND_TYPE_ENTER = 7;
private final int mActionFlags;
private static final int ACTION_FLAGS_IS_REPEATABLE = 0x01;
@@ -555,6 +556,7 @@ public class Key implements Comparable {
case BACKGROUND_TYPE_STICKY_ON: return "stickyOn";
case BACKGROUND_TYPE_ACTION: return "action";
case BACKGROUND_TYPE_SPACEBAR: return "spacebar";
+ case BACKGROUND_TYPE_ENTER: return "enter";
default: return null;
}
}
@@ -978,6 +980,8 @@ public class Key implements Comparable {
new KeyBackgroundState(android.R.attr.state_active),
// 6: BACKGROUND_TYPE_SPACEBAR
new KeyBackgroundState(),
+ // 7: BACKGROUND_TYPE_ENTER
+ new KeyBackgroundState(),
};
}
@@ -989,12 +993,15 @@ public class Key implements Comparable {
@Nonnull
public final Drawable selectBackgroundDrawable(@Nonnull final Drawable keyBackground,
@Nonnull final Drawable functionalKeyBackground,
+ @Nonnull final Drawable enterBackground,
@Nonnull final Drawable spacebarBackground) {
final Drawable background;
- if (mBackgroundType == BACKGROUND_TYPE_FUNCTIONAL) {
+ if (mBackgroundType == BACKGROUND_TYPE_FUNCTIONAL || mBackgroundType == BACKGROUND_TYPE_STICKY_OFF || mBackgroundType == BACKGROUND_TYPE_STICKY_ON) {
background = functionalKeyBackground;
} else if (mBackgroundType == BACKGROUND_TYPE_SPACEBAR) {
background = spacebarBackground;
+ } else if (mBackgroundType == BACKGROUND_TYPE_ENTER) {
+ background = enterBackground;
} else {
background = keyBackground;
}
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index cd5073dacec22de2d004fd551fc184500b308b8d..899ffb93334020f8e8b0e24d30b037afcafaaa26 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -93,6 +93,7 @@ public class KeyboardView extends View {
private final float mVerticalCorrection;
private final Drawable mKeyBackground;
private final Drawable mFunctionalKeyBackground;
+ private final Drawable mEnterKeyBackground;
private final Drawable mSpacebarBackground;
private final float mSpacebarIconWidthRatio;
private final Rect mKeyBackgroundPadding = new Rect();
@@ -139,6 +140,9 @@ public class KeyboardView extends View {
R.styleable.KeyboardView_functionalKeyBackground);
mFunctionalKeyBackground = (functionalKeyBackground != null) ? functionalKeyBackground
: mKeyBackground;
+ final Drawable enterKeyBackground = keyboardViewAttr.getDrawable(
+ R.styleable.KeyboardView_enterKeyBackground);
+ mEnterKeyBackground = (enterKeyBackground!= null) ? enterKeyBackground : mFunctionalKeyBackground;
final Drawable spacebarBackground = keyboardViewAttr.getDrawable(
R.styleable.KeyboardView_spacebarBackground);
mSpacebarBackground = (spacebarBackground != null) ? spacebarBackground : mKeyBackground;
@@ -340,7 +344,7 @@ public class KeyboardView extends View {
if (!key.isSpacer()) {
final Drawable background = key.selectBackgroundDrawable(
- mKeyBackground, mFunctionalKeyBackground, mSpacebarBackground);
+ mKeyBackground, mFunctionalKeyBackground, mEnterKeyBackground, mSpacebarBackground);
if (background != null) {
onDrawKeyBackground(key, canvas, background);
}
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 8ed3a59bf583bda57e6a2d88b986296da0da5717..85369e14cdf93fee0f3284c0f1e2d1a3a2427629 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -16,6 +16,7 @@
package com.android.inputmethod.latin;
+import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;
import static com.android.inputmethod.latin.common.Constants.ImeOption.FORCE_ASCII;
import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE;
import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE_COMPAT;
@@ -72,6 +73,7 @@ import com.android.inputmethod.event.InputTransaction;
import com.android.inputmethod.keyboard.Keyboard;
import com.android.inputmethod.keyboard.KeyboardActionListener;
import com.android.inputmethod.keyboard.KeyboardId;
+import com.android.inputmethod.keyboard.KeyboardLayoutSet;
import com.android.inputmethod.keyboard.KeyboardSwitcher;
import com.android.inputmethod.keyboard.MainKeyboardView;
import com.android.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback;
@@ -788,6 +790,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
cleanupInternalStateForFinishInput();
}
}
+ KeyboardLayoutSet.onKeyboardThemeChanged();
super.onConfigurationChanged(conf);
}
@@ -2008,11 +2011,24 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
private void setNavigationBarVisibility(final boolean visible) {
- if (BuildCompatUtils.EFFECTIVE_SDK_INT > Build.VERSION_CODES.M) {
+ if (BuildCompatUtils.EFFECTIVE_SDK_INT > Build.VERSION_CODES.R) {
// For N and later, IMEs can specify Color.TRANSPARENT to make the navigation bar
// transparent. For other colors the system uses the default color.
getWindow().getWindow().setNavigationBarColor(
- visible ? Color.BLACK : Color.TRANSPARENT);
+ visible ? getColor(R.color.keyboard_navigation_bar) : Color.TRANSPARENT);
+
+ if (visible) {
+ final Configuration configuration = getResources().getConfiguration();
+ final boolean isNightMode = (configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK)
+ == Configuration.UI_MODE_NIGHT_YES;
+ if (!isNightMode) {
+ getWindow().getWindow().getInsetsController().setSystemBarsAppearance(
+ APPEARANCE_LIGHT_NAVIGATION_BARS, APPEARANCE_LIGHT_NAVIGATION_BARS);
+ } else {
+ getWindow().getWindow().getInsetsController().setSystemBarsAppearance(
+ 0, APPEARANCE_LIGHT_NAVIGATION_BARS);
+ }
+ }
}
}
}
diff --git a/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java b/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
index 90221512ffd752d2f6569e058d815b415ef84d53..109cace92f1c796b8ccea58606094416a22d8ae9 100644
--- a/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
+++ b/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
@@ -86,6 +86,7 @@ public final class SystemBroadcastReceiver extends BroadcastReceiver {
} else if (Intent.ACTION_BOOT_COMPLETED.equals(intentAction)) {
Log.i(TAG, "Boot has been completed");
toggleAppIcon(context);
+ disableVoiceKey(context);
} else if (Intent.ACTION_LOCALE_CHANGED.equals(intentAction)) {
Log.i(TAG, "System locale changed");
KeyboardLayoutSet.onSystemLocaleChanged();
@@ -156,4 +157,15 @@ public final class SystemBroadcastReceiver extends BroadcastReceiver {
: PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
}
+
+ public static void disableVoiceKey(final Context context) {
+ final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+ if (prefs.getBoolean(Settings.PREF_VOICE_INPUT_KEY, false) &&
+ !prefs.getBoolean(Settings.PREF_FORCED_DISABLE_VOICE_INPUT_KEY, false)) {
+ prefs.edit()
+ .putBoolean(Settings.PREF_VOICE_INPUT_KEY, false)
+ .putBoolean(Settings.PREF_FORCED_DISABLE_VOICE_INPUT_KEY, true)
+ .apply();
+ }
+ }
}
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java
index 8a1a8a390b7dbf9cb238f90fb68c50fa1fabfb9f..83cc74e5e24056f9c42ac37dd1edc830877562d0 100644
--- a/java/src/com/android/inputmethod/latin/settings/Settings.java
+++ b/java/src/com/android/inputmethod/latin/settings/Settings.java
@@ -58,6 +58,8 @@ 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";
+ // Added by /e/ to disable old enabled voice key
+ public static final String PREF_FORCED_DISABLE_VOICE_INPUT_KEY = "pref_forced_disable_voice_input_key";
public static final String PREF_EDIT_PERSONAL_DICTIONARY = "edit_personal_dictionary";
public static final String PREF_CONFIGURE_DICTIONARIES_KEY = "configure_dictionaries_key";
// PREF_AUTO_CORRECTION_THRESHOLD_OBSOLETE is obsolete. Use PREF_AUTO_CORRECTION instead.
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
index 7a276a6a4d9db1622ed0898222e2afd2808fc406..74884645e2f8e8a2557c225873d6e03f9c1eb18b 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
@@ -366,7 +366,7 @@ public class SettingsValues {
.remove(Settings.PREF_VOICE_MODE_OBSOLETE)
.apply();
}
- return prefs.getBoolean(Settings.PREF_VOICE_INPUT_KEY, true);
+ return prefs.getBoolean(Settings.PREF_VOICE_INPUT_KEY, false);
}
public String dump() {