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

Commit 78d1ca1c authored by Tony Mak's avatar Tony Mak Committed by Android (Google) Code Review
Browse files

Merge "Default apps setting for managed profile"

parents 5f75f5ef 32ccffc0

AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -2719,8 +2719,6 @@ 
            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.applications.ManageDefaultApps" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



        <!-- Conditional receivers, only enabled during silenced state, default off-->

src/com/android/settings/applications/DefaultEmergencyPreference.java

+4 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.pm.PackageInfo; 
import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.AsyncTask;

import android.os.UserManager;

import android.provider.Settings;

import android.telephony.TelephonyManager;

import android.text.TextUtils;
@@ -31,6 +32,7 @@ import android.util.ArraySet; 
import android.util.AttributeSet;



import com.android.settings.AppListPreference;

import com.android.settings.Utils;



import java.util.List;

import java.util.Objects;
@@ -135,7 +137,8 @@ public class DefaultEmergencyPreference extends AppListPreference { 


    public static boolean isAvailable(Context context) {

        return isCapable(context)

                && context.getPackageManager().resolveActivity(QUERY_INTENT, 0) != null;

                && context.getPackageManager().resolveActivity(QUERY_INTENT, 0) != null

                && !Utils.isManagedProfile(UserManager.get(context)) ;

    }



    public static boolean isCapable(Context context) {

src/com/android/settings/applications/DefaultNotificationAssistantPreference.java

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.os.UserManager;

import android.provider.Settings;

import android.service.notification.NotificationAssistantService;

import android.util.AttributeSet;
@@ -34,6 +35,7 @@ import java.util.ArrayList; 
import java.util.List;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.notification.ManagedServiceSettings;



public class DefaultNotificationAssistantPreference extends AppListPreference {
@@ -108,4 +110,8 @@ public class DefaultNotificationAssistantPreference extends AppListPreference { 
        c.emptyText = R.string.no_notification_listeners;

        return c;

    }



    public static boolean isAvailable(Context context) {

        return !Utils.isManagedProfile(UserManager.get(context));

    }

}

src/com/android/settings/applications/DefaultSmsPreference.java

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings.applications; 


import android.content.ComponentName;

import android.content.Context;

import android.os.UserManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.AttributeSet;
@@ -24,6 +25,7 @@ import android.util.AttributeSet; 
import com.android.internal.telephony.SmsApplication;

import com.android.internal.telephony.SmsApplication.SmsApplicationData;

import com.android.settings.AppListPreference;

import com.android.settings.Utils;



import java.util.Collection;

import java.util.Objects;
@@ -69,7 +71,7 @@ public class DefaultSmsPreference extends AppListPreference { 
    public static boolean isAvailable(Context context) {

        TelephonyManager tm =

                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);

        return tm.isSmsCapable();

        return tm.isSmsCapable() && !Utils.isManagedProfile(UserManager.get(context));

    }



}

src/com/android/settings/applications/ManageAssist.java

+7 −0
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ package com.android.settings.applications; 


import android.app.AlertDialog;

import android.content.ComponentName;

import android.content.Context;

import android.content.DialogInterface;

import android.os.Bundle;

import android.os.Handler;

import android.os.UserManager;

import android.provider.Settings;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;
@@ -28,6 +30,7 @@ import android.support.v7.preference.Preference; 
import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;

import com.android.settings.voice.VoiceInputListPreference;



/**
@@ -175,4 +178,8 @@ public class ManageAssist extends SettingsPreferenceFragment 
        mDefaultAssitPref.setValue(assistPackage);

        updateUi();

    }



    public static boolean isAvailable(Context context) {

        return !Utils.isManagedProfile(UserManager.get(context));

    }

}