Dont update #f, #r if flagNoPersonalizedLearning

If imeOptions includes "flagNoPersonalizedLearning" (aka incognito mode)
then do not add utterances to the #f and #r tables, even when they are active.

+ Small changes

Author: Kaljurand

app/build.gradle

@@ -12,7 +12,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     //implementation 'androidx.activity:activity:1.2.0-alpha06'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
-    implementation 'com.google.android.material:material:1.2.0'
+    implementation 'com.google.android.material:material:1.2.1'
 }
 
 android {
@@ -26,8 +26,8 @@ android {
         applicationId 'ee.ioc.phon.android.speak'
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 1738
-        versionName '1.7.38'
+        versionCode 1740
+        versionName '1.7.40'
         vectorDrawables.useSupportLibrary = true
         // Keep only en and et resources
         resConfigs "en", "et"

app/src/main/AndroidManifest.xml

@@ -82,10 +82,16 @@
 
     <!-- <uses-feature android:name="android.hardware.type.watch" /> -->
 
+    <!-- TODO: review -->
+
     <queries>
         <intent>
             <!-- Packages that provide speech recognition services -->
-            <action android:name="android.speech.RecognitionService" />
+            <action android:name="android.intent.action.TTS_SERVICE" />
+        </intent>
+        <intent>
+            <!-- Packages that provide TTS services -->
+            <action android:name="android.intent.action.TTS_SERVICE" />
         </intent>
     </queries>
 
@@ -483,4 +489,4 @@ Also, failed to set the launchMode from the resource, INSTALL_PARSE_FAILED_UNEXP
             android:permission="android.permission.RECORD_AUDIO" />
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/ee/ioc/phon/android/speak/service/SpeechInputMethodService.java

@@ -53,6 +53,7 @@ public class SpeechInputMethodService extends InputMethodService {
     private static final String REWRITES_NAME_FREQUENT = "#f";
     private static final String REWRITES_NAME_CLIP = "#c";
 
+    private boolean mFlagPersonalizedLearning = true;
     private InputMethodManager mInputMethodManager;
     private SpeechInputView mInputView;
     private CommandEditor mCommandEditor;
@@ -123,6 +124,10 @@ public void onStartInput(EditorInfo attribute, boolean restarting) {
         super.onStartInput(attribute, restarting);
         String type = "UNKNOWN";
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mFlagPersonalizedLearning = (attribute.imeOptions & EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING) != EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING;
+        }
+
         switch (attribute.inputType & InputType.TYPE_MASK_CLASS) {
             case InputType.TYPE_CLASS_NUMBER:
                 type = "NUMBER";
@@ -163,7 +168,7 @@ public void onStartInput(EditorInfo attribute, boolean restarting) {
 
             default:
         }
-        Log.i("onStartInput: " + type + ", " + attribute.inputType + ", " + attribute.imeOptions + ", " + restarting);
+        Log.i("onStartInput: " + type + ", " + attribute.inputType + ", " + attribute.imeOptions + ", " + restarting + ", learning: " + mFlagPersonalizedLearning);
     }
 
     /**
@@ -352,7 +357,7 @@ private void commitResults(List<String> results) {
                 if (editorResult != null && mInputView != null && editorResult.isCommand()) {
                     mInputView.showMessage(editorResult.getRewrite().ppCommand(), editorResult.isSuccess());
                 }
-                if (editorResult != null) {
+                if (editorResult != null && mFlagPersonalizedLearning) {
                     String rewritesRec = getRewrites(REWRITES_NAME_RECENT);
                     if (rewritesRec != null) {
                         UtteranceRewriter ur = mRuleManager.addRecent(editorResult, rewritesRec);

app/src/main/java/ee/ioc/phon/android/speak/view/SpeechInputView.java

@@ -166,6 +166,7 @@ public void setListener(final SpeechInputViewListener listener, EditorInfo edito
             mApp = new ComponentName(editorInfo.packageName, editorInfo.packageName);
         }
         if (mBImeAction != null && editorInfo != null) {
+            // TODO: test
             boolean overrideEnter = (editorInfo.imeOptions & EditorInfo.IME_FLAG_NO_ENTER_ACTION) == 0;
             boolean useEnter = !overrideEnter;
             final int imeAction = editorInfo.imeOptions & EditorInfo.IME_MASK_ACTION;

app/src/main/res/layout/encoder_demo.xml

@@ -13,6 +13,14 @@
         android:gravity="center"
         android:orientation="vertical">
 
+        <EditText
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:hint="flagNoPersonalizedLearning"
+            android:imeActionLabel="NEXT"
+            android:imeOptions="flagNoPersonalizedLearning|actionNext"
+            android:inputType="text" />
+
         <EditText
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"