PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[MTE] add more search terms for user toggle"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-12-06 23:54:27 +00:00
committed by Android (Google) Code Review
parent 4c47fe5a66 f593803c88
commit 8318b2b7b6
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -8086,6 +8086,8 @@
<string name="memtag_reboot_no">Not now</string> <string name="memtag_reboot_no">Not now</string>
<!-- [CHAR LIMIT=NONE] Label for Learn More link. --> <!-- [CHAR LIMIT=NONE] Label for Learn More link. -->
<string name="memtag_learn_more">Learn more about Advanced memory protection.</string> <string name="memtag_learn_more">Learn more about Advanced memory protection.</string>
<!-- [CHAR LIMIT=NONE] Search keywords for Advanced memory protection option. -->
<string name="keywords_memtag" translatable="false">MTE, Memory Tagging Extension</string>
<!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] --> <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
<string name="opening_paragraph_delete_profile_unknown_company">This work profile is managed by:</string> <string name="opening_paragraph_delete_profile_unknown_company">This work profile is managed by:</string>

1
res/xml/security_advanced_settings.xml
View File

@@ -112,6 +112,7 @@
android:id="@+id/memtag_page" android:id="@+id/memtag_page"
android:key="memtag_page" android:key="memtag_page"
android:title="@string/memtag_title" android:title="@string/memtag_title"
settings:keywords="@string/keywords_memtag"
android:fragment="com.android.settings.security.MemtagPage" android:fragment="com.android.settings.security.MemtagPage"
settings:controller="com.android.settings.security.MemtagPagePreferenceController" /> settings:controller="com.android.settings.security.MemtagPagePreferenceController" />