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

Commit a43471bf authored by Oli Thompson's avatar Oli Thompson Committed by Android (Google) Code Review
Browse files

Merge "Update ActionDisabledByAdminDialog" into main

parents 497e4e4e 41fb1b6c

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -4539,7 +4539,7 @@ 
        </activity>



        <activity android:name=".enterprise.ActionDisabledByAdminDialog"

                  android:theme="@style/Theme.AlertDialog"

                  android:theme="@style/Theme.AlertDialog.SettingsLib"

                android:taskAffinity="com.android.settings.enterprise"

                android:excludeFromRecents="true"

                android:exported="true"

src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ import android.security.advancedprotection.AdvancedProtectionManager; 


import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

import com.android.settingslib.widget.SettingsThemeHelper;

import com.android.settingslib.widget.theme.R;

import com.android.settingslib.widget.theme.flags.Flags;



public class ActionDisabledByAdminDialog extends Activity

        implements DialogInterface.OnDismissListener {
@@ -39,6 +42,9 @@ public class ActionDisabledByAdminDialog extends Activity 


    @Override

    protected void onCreate(Bundle savedInstanceState) {

        if (Flags.isExpressiveDesignEnabled() && SettingsThemeHelper.isExpressiveTheme(this)) {

            setTheme(R.style.Theme_AlertDialog_SettingsLib_Expressive);

        }

        super.onCreate(savedInstanceState);

        final RestrictedLockUtils.EnforcedAdmin enforcedAdmin =

                getAdminDetailsFromIntent(getIntent());