Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7eb02c8c authored by Yvonne Jiang's avatar Yvonne Jiang
Browse files

Update the supervised device admin dialog text. 

Flag: android.app.supervision.flags.enable_supervision_settings_screen
Bug: 399481325
Test: manual
Change-Id: Id5d9178e588a4e21db2dfe31c548c14f70f1a5cf
parent bb6caca0

packages/SettingsLib/src/com/android/settingslib/enterprise/DeviceAdminStringProvider.java

+3 −0
Original line number Diff line number Diff line
@@ -87,4 +87,7 @@ public interface DeviceAdminStringProvider { 
     * Returns the dialog contents for when biometrics require parental consent.

     */

    String getDisabledBiometricsParentConsentContent();



    /** Returns the dialog title when the setting is blocked by parental controls. */

    String getDisabledByParentalControlsTitle();

}

packages/SettingsLib/src/com/android/settingslib/enterprise/SupervisedDeviceActionDisabledByAdminController.java

+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settingslib.enterprise;





import android.app.supervision.flags.Flags;

import android.content.ComponentName;

import android.content.Context;

import android.content.DialogInterface;
@@ -49,6 +49,9 @@ final class SupervisedDeviceActionDisabledByAdminController 


    @Override

    public String getAdminSupportTitle(@Nullable String restriction) {

        if (Flags.enableSupervisionSettingsScreen()) {

            return mStringProvider.getDisabledByParentalControlsTitle();

        }

        return mStringProvider.getDisabledBiometricsParentConsentTitle();

    }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/FakeDeviceAdminStringProvider.java

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ class FakeDeviceAdminStringProvider implements DeviceAdminStringProvider { 
    static final String DEFAULT_BIOMETRIC_TITLE = "biometric_title";

    static final String DEFAULT_BIOMETRIC_CONTENTS = "biometric_contents";

    static final String DISABLED_BY_PARENT_CONTENT = "disabled_by_parent_constent";

    static final String DISABLED_BY_PARENTAL_CONTROLS_TITLE =

            "disabled_by_parental_controls_title";

    static final DeviceAdminStringProvider DEFAULT_DEVICE_ADMIN_STRING_PROVIDER =

            new FakeDeviceAdminStringProvider(/* url = */ null);
@@ -107,4 +109,8 @@ class FakeDeviceAdminStringProvider implements DeviceAdminStringProvider { 
        return DEFAULT_BIOMETRIC_CONTENTS;

    }



    @Override

    public String getDisabledByParentalControlsTitle() {

        return DISABLED_BY_PARENTAL_CONTROLS_TITLE;

    }

}