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

Commit 72354747 authored by Matías Hernández's avatar Matías Hernández
Browse files

Inline MODES_API flag 

Bug: 310620812
Test: Preexisting
Flag: EXEMPT Inlining flag
Change-Id: I54ad81d87ea4ce85940400b0e8680a1bac0ca342
parent d9214f13

src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java

+2 −8
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.os.AsyncTask;



import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;
@@ -139,13 +138,8 @@ public class ApprovalPreferenceController extends BasePreferenceController { 
    public void disable(final ComponentName cn) {

        logSpecialPermissionChange(true, cn.getPackageName());

        mNm.setNotificationListenerAccessGranted(cn, false);

        if (!mNm.isNotificationPolicyAccessGrantedForPackage(

                cn.getPackageName())) {

            if (android.app.Flags.modesApi()) {

        if (!mNm.isNotificationPolicyAccessGrantedForPackage(cn.getPackageName())) {

            mNm.removeAutomaticZenRules(cn.getPackageName(), /* fromUser= */ true);

            } else {

                mNm.removeAutomaticZenRules(cn.getPackageName());

            }

        }

    }

src/com/android/settings/applications/specialaccess/notificationaccess/FriendlyWarningDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class FriendlyWarningDialogFragment extends InstrumentedDialogFragment { 
        NotificationAccessDetails parent = (NotificationAccessDetails) getTargetFragment();



        final String summary = getResources().getString(

                Flags.modesApi() && Flags.modesUi()

                Flags.modesUi()

                        ? R.string.notification_listener_disable_modes_warning_summary

                        : R.string.notification_listener_disable_warning_summary,

                label);

src/com/android/settings/applications/specialaccess/notificationaccess/ScaryWarningDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class ScaryWarningDialogFragment extends InstrumentedDialogFragment { 
        ((TextView) content.findViewById(R.id.prompt)).setText(prompt);



        ((TextView) content.findViewById(R.id.settings_description)).setText(

                Flags.modesApi() && Flags.modesUi()

                Flags.modesUi()

                        ? R.string.nls_feature_modes_settings_summary

                        : R.string.nls_feature_settings_summary);

src/com/android/settings/applications/specialaccess/zenaccess/FriendlyWarningDialogFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -59,12 +59,12 @@ public class FriendlyWarningDialogFragment extends InstrumentedDialogFragment { 
        final String label = args.getString(KEY_LABEL);



        final String title = getResources().getString(

                Flags.modesApi() && Flags.modesUi()

                Flags.modesUi()

                        ? R.string.zen_modes_access_revoke_warning_dialog_title

                        : R.string.zen_access_revoke_warning_dialog_title,

                label);

        final String summary = getResources()

                .getString(Flags.modesApi() && Flags.modesUi()

                .getString(Flags.modesUi()

                        ? R.string.zen_modes_access_revoke_warning_dialog_summary

                        : R.string.zen_access_revoke_warning_dialog_summary);

src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -57,12 +57,12 @@ public class ScaryWarningDialogFragment extends InstrumentedDialogFragment { 
        final String label = args.getString(KEY_LABEL);



        final String title = getResources().getString(

                Flags.modesApi() && Flags.modesUi()

                Flags.modesUi()

                        ? R.string.zen_modes_access_warning_dialog_title

                        : R.string.zen_access_warning_dialog_title,

                label);

        final String summary = getResources()

                .getString(Flags.modesApi() && Flags.modesUi()

                .getString(Flags.modesUi()

                        ? R.string.zen_modes_access_warning_dialog_summary

                        : R.string.zen_access_warning_dialog_summary);