Loading res/values/strings.xml +6 −6 Original line number Diff line number Diff line Loading @@ -14533,11 +14533,11 @@ Data usage charges may apply.</string> <!-- Search keywords for supervision settings [CHAR LIMIT=NONE] --> <string name="keywords_supervision_settings">supervision, parental supervision, parental controls</string> <!-- Title for supervision PIN management settings entry [CHAR LIMIT=60] --> <string name="supervision_pin_management_preference_title">Manage PIN</string> <string name="supervision_pin_management_preference_title">Manage your PIN</string> <!-- Description for supervision PIN management settings entry, in the case of adding a PIN recovery method[CHAR LIMIT=NONE] --> <string name="supervision_pin_management_preference_summary_add">Add PIN recovery</string> <string name="supervision_pin_management_preference_summary_add">Add recovery email</string> <!-- Description for supervision PIN management settings entry, in the case of verifying the PIN recovery method[CHAR LIMIT=NONE] --> <string name="supervision_pin_management_preference_summary_verify_recovery">Verify PIN recovery</string> <string name="supervision_pin_management_preference_summary_verify_recovery">Verify recovery email</string> <!-- Title for supervision change PIN setting entry [CHAR LIMIT=60] --> <string name="supervision_change_pin_preference_title">Change PIN</string> <!-- Title for supervision forgot PIN setting entry [CHAR LIMIT=60] --> Loading @@ -14549,9 +14549,9 @@ Data usage charges may apply.</string> <!-- Summary for supervision delete pin setting entry [CHAR LIMIT=NONE] --> <string name="supervision_delete_pin_preference_summary">This will reset all your supervision settings</string> <!-- Title for adding supervision PIN recovery setting entry [CHAR LIMIT=NONE] --> <string name="supervision_add_pin_recovery_title">Tap to add recovery</string> <string name="supervision_add_pin_recovery_title">Add recovery email</string> <!-- Title for adding supervision PIN recovery setting entry [CHAR LIMIT=NONE] --> <string name="supervision_verify_pin_recovery_title">Tap to verify recovery</string> <string name="supervision_verify_pin_recovery_title">Verify your email</string> <!-- Title for web content filters entry [CHAR LIMIT=60] --> <string name="supervision_web_content_filters_title">Web content filters</string> <!-- Title for web content filters browser category [CHAR LIMIT=60] --> Loading @@ -14576,7 +14576,7 @@ Data usage charges may apply.</string> <!-- Title on activity to choose PIN for supervision setup [CHAR LIMIT=NONE] --> <string name="supervision_choose_your_pin_header">Set a parental controls PIN</string> <string name="supervision_confirm_your_pin_header">Confirm PIN</string> <string name ="supervision_pin_reset_success_toast">Parental control PIN reset</string> <string name="supervision_pin_reset_success_toast">PIN updated</string> <string name="accessibility_illustration_content_description"><xliff:g id="feature" example="Select to Speak">%1$s</xliff:g> animation</string> <!-- Light theme customization for lottie illustration. Not translatable. --> src/com/android/settings/supervision/SupervisionDashboardScreen.kt +4 −0 Original line number Diff line number Diff line Loading @@ -62,6 +62,10 @@ class SupervisionDashboardScreen : PreferenceScreenCreator, PreferenceLifecycleP supervisionClient?.close() } override fun onResume(context: PreferenceLifecycleContext) { context.notifyPreferenceChange(SupervisionPinManagementScreen.KEY) } override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) { val supervisionClient = getSupervisionClient(context) Loading src/com/android/settings/supervision/SupervisionSetupRecoveryPreference.kt +0 −1 Original line number Diff line number Diff line Loading @@ -100,7 +100,6 @@ class SupervisionSetupRecoveryPreference : notifyPreferenceChange(KEY) notifyPreferenceChange(SupervisionPinRecoveryPreference.KEY) notifyPreferenceChange(SupervisionUpdateRecoveryEmailPreference.KEY) notifyPreferenceChange(SupervisionPinManagementScreen.KEY) } } } Loading Loading
res/values/strings.xml +6 −6 Original line number Diff line number Diff line Loading @@ -14533,11 +14533,11 @@ Data usage charges may apply.</string> <!-- Search keywords for supervision settings [CHAR LIMIT=NONE] --> <string name="keywords_supervision_settings">supervision, parental supervision, parental controls</string> <!-- Title for supervision PIN management settings entry [CHAR LIMIT=60] --> <string name="supervision_pin_management_preference_title">Manage PIN</string> <string name="supervision_pin_management_preference_title">Manage your PIN</string> <!-- Description for supervision PIN management settings entry, in the case of adding a PIN recovery method[CHAR LIMIT=NONE] --> <string name="supervision_pin_management_preference_summary_add">Add PIN recovery</string> <string name="supervision_pin_management_preference_summary_add">Add recovery email</string> <!-- Description for supervision PIN management settings entry, in the case of verifying the PIN recovery method[CHAR LIMIT=NONE] --> <string name="supervision_pin_management_preference_summary_verify_recovery">Verify PIN recovery</string> <string name="supervision_pin_management_preference_summary_verify_recovery">Verify recovery email</string> <!-- Title for supervision change PIN setting entry [CHAR LIMIT=60] --> <string name="supervision_change_pin_preference_title">Change PIN</string> <!-- Title for supervision forgot PIN setting entry [CHAR LIMIT=60] --> Loading @@ -14549,9 +14549,9 @@ Data usage charges may apply.</string> <!-- Summary for supervision delete pin setting entry [CHAR LIMIT=NONE] --> <string name="supervision_delete_pin_preference_summary">This will reset all your supervision settings</string> <!-- Title for adding supervision PIN recovery setting entry [CHAR LIMIT=NONE] --> <string name="supervision_add_pin_recovery_title">Tap to add recovery</string> <string name="supervision_add_pin_recovery_title">Add recovery email</string> <!-- Title for adding supervision PIN recovery setting entry [CHAR LIMIT=NONE] --> <string name="supervision_verify_pin_recovery_title">Tap to verify recovery</string> <string name="supervision_verify_pin_recovery_title">Verify your email</string> <!-- Title for web content filters entry [CHAR LIMIT=60] --> <string name="supervision_web_content_filters_title">Web content filters</string> <!-- Title for web content filters browser category [CHAR LIMIT=60] --> Loading @@ -14576,7 +14576,7 @@ Data usage charges may apply.</string> <!-- Title on activity to choose PIN for supervision setup [CHAR LIMIT=NONE] --> <string name="supervision_choose_your_pin_header">Set a parental controls PIN</string> <string name="supervision_confirm_your_pin_header">Confirm PIN</string> <string name ="supervision_pin_reset_success_toast">Parental control PIN reset</string> <string name="supervision_pin_reset_success_toast">PIN updated</string> <string name="accessibility_illustration_content_description"><xliff:g id="feature" example="Select to Speak">%1$s</xliff:g> animation</string> <!-- Light theme customization for lottie illustration. Not translatable. -->
src/com/android/settings/supervision/SupervisionDashboardScreen.kt +4 −0 Original line number Diff line number Diff line Loading @@ -62,6 +62,10 @@ class SupervisionDashboardScreen : PreferenceScreenCreator, PreferenceLifecycleP supervisionClient?.close() } override fun onResume(context: PreferenceLifecycleContext) { context.notifyPreferenceChange(SupervisionPinManagementScreen.KEY) } override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(context, this) { val supervisionClient = getSupervisionClient(context) Loading
src/com/android/settings/supervision/SupervisionSetupRecoveryPreference.kt +0 −1 Original line number Diff line number Diff line Loading @@ -100,7 +100,6 @@ class SupervisionSetupRecoveryPreference : notifyPreferenceChange(KEY) notifyPreferenceChange(SupervisionPinRecoveryPreference.KEY) notifyPreferenceChange(SupervisionUpdateRecoveryEmailPreference.KEY) notifyPreferenceChange(SupervisionPinManagementScreen.KEY) } } } Loading