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

Commit 41fb1b6c authored by oli's avatar oli Committed by Oli Thompson
Browse files

Update ActionDisabledByAdminDialog 

use expressive styles, previous dialog had incorrect color accent

Bug: 409342412
Test: visual
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled

Change-Id: I09d36b899f81f8e98435905234005cee2ea6eb68
parent 25fc1436

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -4538,7 +4538,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());