Change Toggle UX to "Require encryption"

Changes the UX of enable/disable null ciphers to
"Require encryption". The default value is off, making
the default behavior equivalent to the previous version
of the toggle.

Test: atest NullAlgorithmsPreferenceControllerTest
Test: Manual testing in cuttlefish
Bug: 264540492
Change-Id: Iaa0c9c259559a205aacad9fb9af8de6b54782c8d
This commit is contained in:
Gil Cukierman
2023-01-11 18:42:05 +00:00
parent c9e42d4d73
commit 0251b272aa
4 changed files with 22 additions and 24 deletions

View File

@@ -11109,10 +11109,10 @@
<!-- Title for if toggle access is disabled by carrier [CHAR LIMIT=NONE] -->
<string name="enable_2g_summary_disabled_carrier"><xliff:g id="carrier_name_2g" example="Google Fi">%1$s</xliff:g> requires 2G to be available</string>
<!-- Title for toggle if user wants to allow null cellular algorithms [CHAR LIMIT=40] -->
<string name="allow_null_algorithms_title">Allow less secure connection</string>
<!-- Summary for if the user wants to allow null cellular algorithms [CHAR LIMIT=NONE] -->
<string name="allow_null_algorithms_summary">May improve your signal in some locations. For emergency calls, less secure connections are always allowed.</string>
<!-- Title for toggle if user wants to require cellular encryption [CHAR LIMIT=40] -->
<string name="require_cellular_encryption_title">Require encryption</string>
<!-- Summary for if the user wants to require cellular encryption [CHAR LIMIT=NONE] -->
<string name="require_cellular_encryption_summary">Encryption is more secure, but you might not be able to connect in some locations. For emergency calls, encryption is never required</string>
<!-- Label for All services preference in App info settings [CHAR LIMIT=40] -->
<string name="app_info_all_services_label">All services</string>

View File

@@ -251,9 +251,9 @@
settings:userRestriction="no_cellular_2g"/>
<SwitchPreference
android:key="allow_null_algorithms"
android:title="@string/allow_null_algorithms_title"
android:summary="@string/allow_null_algorithms_summary"
android:key="require_cellular_encryption"
android:title="@string/require_cellular_encryption_title"
android:summary="@string/require_cellular_encryption_summary"
settings:controller=
"com.android.settings.network.telephony.NullAlgorithmsPreferenceController" />