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

Commit b2ed2d85 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Add policy disabled msg as empty views in zenmode related fragments."

parents 1147faa4 366d8809

src/com/android/settings/notification/ZenModeAutomationSettings.java

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { 
    @Override

    public void onResume() {

        super.onResume();

        if (isUiRestricted()) {

            return;

        }

        updateControls();

    }

src/com/android/settings/notification/ZenModeEventRuleSettings.java

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase { 
    @Override

    public void onResume() {

        super.onResume();

        if (isUiRestricted()) {

            return;

        }

        if (!mCreate) {

            reloadCalendar();

        }

src/com/android/settings/notification/ZenModeRuleSettingsBase.java

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase 
    @Override

    public void onResume() {

        super.onResume();

        if (isUiRestricted()) {

            return;

        }

        updateControls();

    }

src/com/android/settings/notification/ZenModeSettings.java

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ public class ZenModeSettings extends ZenModeSettingsBase { 
    @Override

    public void onResume() {

        super.onResume();

        if (isUiRestricted()) {

            return;

        }

        updateControls();

    }

src/com/android/settings/notification/ZenModeSettingsBase.java

+9 −1
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ import android.provider.Settings; 
import android.provider.Settings.Global;

import android.service.notification.ZenModeConfig;

import android.util.Log;

import android.view.View;



import com.android.settings.R;

import com.android.settings.RestrictedSettingsFragment;



import java.util.List;
@@ -67,10 +69,16 @@ abstract public class ZenModeSettingsBase extends RestrictedSettingsFragment { 
        maybeRefreshRules(true, true /*fireChanged*/);

        mSettingsObserver.register();

        if (isUiRestricted()) {

            finish();

            getPreferenceScreen().removeAll();

            return;

        }

    }



    @Override

    protected View initAdminSupportDetailsView() {

        return getActivity().findViewById(R.id.admin_support_details);

    }



    @Override

    public void onPause() {

        super.onPause();