Merge cherrypicks of ['googleplex-android-review.googlesource.com/32887373'] into 25Q2-release.
Change-Id: Ia413b76ff8767e69f8a757e39d65c5aeb709b2c7
This commit is contained in:
@@ -224,7 +224,7 @@
|
|||||||
settings:keywords="@string/keywords_app_pinning"
|
settings:keywords="@string/keywords_app_pinning"
|
||||||
settings:controller="com.android.settings.security.ScreenPinningPreferenceController" />
|
settings:controller="com.android.settings.security.ScreenPinningPreferenceController" />
|
||||||
|
|
||||||
<Preference
|
<com.android.settingslib.RestrictedPreference
|
||||||
android:order="300"
|
android:order="300"
|
||||||
android:id="@+id/memtag_page"
|
android:id="@+id/memtag_page"
|
||||||
android:key="memtag_page"
|
android:key="memtag_page"
|
||||||
|
Reference in New Issue
Block a user