From edd3310d03a6c1e0cf80f3eb77b2e292c5d64aa1 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 9 Mar 2023 10:52:46 +0000 Subject: [PATCH] Set "no personalized learning" flag for all text input. --- .../briar/android/account/SetPasswordFragment.java | 3 ++- .../src/main/res/layout/activity_change_password.xml | 4 +++- briar-android/src/main/res/layout/activity_create_forum.xml | 1 + briar-android/src/main/res/layout/emoji_text_input_view.xml | 2 +- briar-android/src/main/res/layout/fragment_alias_dialog.xml | 1 + briar-android/src/main/res/layout/fragment_create_group.xml | 1 + briar-android/src/main/res/layout/fragment_link_exchange.xml | 1 + briar-android/src/main/res/layout/fragment_nickname.xml | 1 + briar-android/src/main/res/layout/fragment_password.xml | 2 +- briar-android/src/main/res/layout/fragment_report_form.xml | 4 +++- .../src/main/res/layout/fragment_rss_feed_import.xml | 2 +- .../src/main/res/layout/fragment_setup_author_name.xml | 2 +- briar-android/src/main/res/layout/fragment_setup_password.xml | 4 ++-- 13 files changed, 19 insertions(+), 9 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java index 3d2c2d34a..9d0047570 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java @@ -65,7 +65,8 @@ public class SetPasswordFragment extends SetupFragment { if (!viewModel.needToShowDozeFragment()) { nextButton.setText(R.string.create_account_button); - passwordConfirmation.setImeOptions(IME_ACTION_DONE); + int options = passwordConfirmation.getImeOptions(); + passwordConfirmation.setImeOptions(options | IME_ACTION_DONE); } viewModel.getIsCreatingAccount() diff --git a/briar-android/src/main/res/layout/activity_change_password.xml b/briar-android/src/main/res/layout/activity_change_password.xml index 1737eb331..34f4414bf 100644 --- a/briar-android/src/main/res/layout/activity_change_password.xml +++ b/briar-android/src/main/res/layout/activity_change_password.xml @@ -33,6 +33,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/current_password" + android:imeOptions="flagNoPersonalizedLearning" android:importantForAutofill="no" android:inputType="textPassword" android:maxLines="1" /> @@ -57,6 +58,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/choose_new_password" + android:imeOptions="flagNoPersonalizedLearning" android:importantForAutofill="no" android:inputType="textPassword" android:maxLines="1" /> @@ -78,7 +80,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/confirm_new_password" - android:imeOptions="actionDone" + android:imeOptions="flagNoPersonalizedLearning|actionDone" android:importantForAutofill="no" android:inputType="textPassword" android:maxLines="1" /> diff --git a/briar-android/src/main/res/layout/activity_create_forum.xml b/briar-android/src/main/res/layout/activity_create_forum.xml index 6f0502ef6..7053cb00d 100644 --- a/briar-android/src/main/res/layout/activity_create_forum.xml +++ b/briar-android/src/main/res/layout/activity_create_forum.xml @@ -19,6 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/choose_forum_hint" + android:imeOptions="flagNoPersonalizedLearning" android:importantForAutofill="no" android:inputType="text|textCapSentences" android:maxLines="1" /> diff --git a/briar-android/src/main/res/layout/emoji_text_input_view.xml b/briar-android/src/main/res/layout/emoji_text_input_view.xml index 296f3cab0..78d1682f0 100644 --- a/briar-android/src/main/res/layout/emoji_text_input_view.xml +++ b/briar-android/src/main/res/layout/emoji_text_input_view.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:background="@android:color/transparent" - android:imeOptions="actionSend" + android:imeOptions="flagNoPersonalizedLearning|actionSend" android:inputType="textMultiLine|textCapSentences|textAutoCorrect" android:minHeight="@dimen/text_input_height" android:textColor="?android:attr/textColorPrimary" diff --git a/briar-android/src/main/res/layout/fragment_alias_dialog.xml b/briar-android/src/main/res/layout/fragment_alias_dialog.xml index 37a4fdd1c..770fa47a7 100644 --- a/briar-android/src/main/res/layout/fragment_alias_dialog.xml +++ b/briar-android/src/main/res/layout/fragment_alias_dialog.xml @@ -30,6 +30,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:hint="@string/set_contact_alias_hint" + android:imeOptions="flagNoPersonalizedLearning" android:inputType="text|textCapWords" android:textColor="?android:attr/textColorPrimary" android:textSize="@dimen/text_size_medium" /> diff --git a/briar-android/src/main/res/layout/fragment_create_group.xml b/briar-android/src/main/res/layout/fragment_create_group.xml index 10786b5a4..adaefc58f 100644 --- a/briar-android/src/main/res/layout/fragment_create_group.xml +++ b/briar-android/src/main/res/layout/fragment_create_group.xml @@ -19,6 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/groups_create_group_hint" + android:imeOptions="flagNoPersonalizedLearning" android:importantForAutofill="no" android:inputType="text|textCapSentences" android:maxLines="1" /> diff --git a/briar-android/src/main/res/layout/fragment_link_exchange.xml b/briar-android/src/main/res/layout/fragment_link_exchange.xml index 9b8bab8e6..db85e471d 100644 --- a/briar-android/src/main/res/layout/fragment_link_exchange.xml +++ b/briar-android/src/main/res/layout/fragment_link_exchange.xml @@ -205,6 +205,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:hint="@string/contact_link_hint" + android:imeOptions="flagNoPersonalizedLearning" android:importantForAutofill="no" android:inputType="textUri" /> diff --git a/briar-android/src/main/res/layout/fragment_nickname.xml b/briar-android/src/main/res/layout/fragment_nickname.xml index 34d8c98b3..3d614968a 100644 --- a/briar-android/src/main/res/layout/fragment_nickname.xml +++ b/briar-android/src/main/res/layout/fragment_nickname.xml @@ -136,6 +136,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:hint="@string/add_contact_choose_a_nickname" + android:imeOptions="flagNoPersonalizedLearning" android:importantForAutofill="no" android:inputType="text|textCapWords" /> diff --git a/briar-android/src/main/res/layout/fragment_password.xml b/briar-android/src/main/res/layout/fragment_password.xml index 484c53f52..410de2f56 100644 --- a/briar-android/src/main/res/layout/fragment_password.xml +++ b/briar-android/src/main/res/layout/fragment_password.xml @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/enter_password" - android:imeOptions="actionDone" + android:imeOptions="flagNoPersonalizedLearning|actionDone" android:inputType="textPassword" android:maxLines="1" /> diff --git a/briar-android/src/main/res/layout/fragment_report_form.xml b/briar-android/src/main/res/layout/fragment_report_form.xml index e2b4391b2..35ad8c3d7 100644 --- a/briar-android/src/main/res/layout/fragment_report_form.xml +++ b/briar-android/src/main/res/layout/fragment_report_form.xml @@ -28,6 +28,7 @@ android:id="@+id/user_comment" android:layout_width="match_parent" android:layout_height="wrap_content" + android:imeOptions="flagNoPersonalizedLearning" android:inputType="textMultiLine|textCapSentences" tools:hint="@string/describe_crash" /> @@ -51,6 +52,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/optional_contact_email" + android:imeOptions="flagNoPersonalizedLearning" android:inputType="textEmailAddress" android:maxLines="1" /> @@ -61,8 +63,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/margin_large" - android:layout_marginRight="@dimen/margin_large" android:layout_marginTop="@dimen/margin_large" + android:layout_marginRight="@dimen/margin_large" android:text="@string/privacy_policy" android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" app:layout_constraintStart_toStartOf="parent" diff --git a/briar-android/src/main/res/layout/fragment_rss_feed_import.xml b/briar-android/src/main/res/layout/fragment_rss_feed_import.xml index 9ee118e4d..c700d2857 100644 --- a/briar-android/src/main/res/layout/fragment_rss_feed_import.xml +++ b/briar-android/src/main/res/layout/fragment_rss_feed_import.xml @@ -23,7 +23,7 @@ android:background="@android:color/transparent" android:gravity="top" android:hint="@string/blogs_rss_feeds_import_hint" - android:imeOptions="actionDone" + android:imeOptions="flagNoPersonalizedLearning|actionDone" android:importantForAutofill="no" android:inputType="textUri" android:padding="@dimen/margin_medium" diff --git a/briar-android/src/main/res/layout/fragment_setup_author_name.xml b/briar-android/src/main/res/layout/fragment_setup_author_name.xml index 2b644cd45..f8b8ca9c6 100644 --- a/briar-android/src/main/res/layout/fragment_setup_author_name.xml +++ b/briar-android/src/main/res/layout/fragment_setup_author_name.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/choose_nickname" - android:imeOptions="actionNext" + android:imeOptions="flagNoPersonalizedLearning|actionNext" android:inputType="text|textCapWords" android:maxLines="1" /> diff --git a/briar-android/src/main/res/layout/fragment_setup_password.xml b/briar-android/src/main/res/layout/fragment_setup_password.xml index 1f8dc05f9..a1bf009a3 100644 --- a/briar-android/src/main/res/layout/fragment_setup_password.xml +++ b/briar-android/src/main/res/layout/fragment_setup_password.xml @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/choose_password" - android:imeOptions="actionNext" + android:imeOptions="flagNoPersonalizedLearning|actionNext" android:inputType="textPassword" android:maxLines="1"> @@ -71,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/confirm_password" - android:imeOptions="actionNext" + android:imeOptions="flagNoPersonalizedLearning|actionNext" android:inputType="textPassword" android:maxLines="1" />