commit ac8ba2ae083bd1faa7845a807b18ceebf13d4fe7
author Joshua Mccloskey <joshmccloskey@google.com> Mon Jul 22 17:27:02 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 22 17:27:02 2024 +0000
tree 79745961a9fe53b1b58d8fc0e5588049093e0b4e
parent 6e9555e604301e37615e7c34afe65fe346f77a21
parent 9ce9cb283397f985d4e75e09e41fe3a2a72a6634

Merge "Show disabled summary for CDC" into main

src/com/android/settings/password/ChooseLockGeneric.java

diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index 915fe17..b4f13e8 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -777,6 +777,9 @@
                         entries.removePreference(pref);
                     } else if (!enabled) {
                         pref.setEnabled(false);
+                        pref.setSummary(
+                                com.android.settingslib.widget
+                                        .restricted.R.string.disabled_by_admin);
                     }
                 }
             }