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

Commit c2b8fd2e authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c 

Change-Id: Icdfbcdc0c64a6784a0593f34cb9e141bbbc259e7
parents f62beedb 7fb6f35c

res/drawable/ic_download_for_offline.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<vector android:autoMirrored="true" android:height="24dp"

    android:viewportHeight="24" android:viewportWidth="24"

    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="#4285F4" android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10 10,-4.49 10,-10S17.51,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM14.59,8.59L16,10l-4,4 -4,-4 1.41,-1.41L11,10.17L11,6h2v4.17l1.59,-1.58zM17,17L7,17v-2h10v2z"/>

</vector>

res/values/strings.xml

+11 −14
Original line number Diff line number Diff line
@@ -8537,6 +8537,12 @@ 
    When a user connects select work and personal apps, they can access work and personal data together. [CHAR LIMIT=50] -->

    <string name="interact_across_profiles_title">Connected work &amp; personal apps</string>









    <!-- Settings subtext. This text is shown when the work and personal apps are connected. [CHAR LIMIT=45] -->









    <string name="interact_across_profiles_summary_allowed">Connected</string>

















    <!-- Settings subtext. This text is shown when the work and personal apps are not connected. [CHAR LIMIT=45] -->









    <string name="interact_across_profiles_summary_not_allowed">Not connected</string>

















    <!-- Settings subtext. This text is shown when a user doesn't have any connected apps. [CHAR LIMIT=NONE] -->









    <string name="interact_across_profiles_empty_text">No connected apps</string>
















@@ -8603,27 +8609,18 @@















    <!-- Banner title. This banner lets a user know that they need to install an app in their









    work profile in order to connect it to the corresponding personal app.









    The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=50]-->









    <string name="interact_across_profiles_install_work_app_title">Install <xliff:g id="name" example="Calendar">%1$s</xliff:g> in your work profile</string>

















    <!-- Banner text. This banner lets a user know that they need to install an app in their









    work profile in order to connect it to the corresponding personal app.









    The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=NONE]-->









    <string name="interact_across_profiles_install_work_app_summary">To connect these apps, install the <xliff:g id="name" example="Calendar">%1$s</xliff:g> app in your work profile</string>









    <string name="interact_across_profiles_install_work_app_title">Install work <xliff:g id="name" example="Calendar">%1$s</xliff:g> to connect these apps</string>

















    <!-- Banner title. This banner lets a user know that they need to install an app in their









    personal profile in order to connect it to the corresponding work app.









    The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=50]-->









    <string name="interact_across_profiles_install_personal_app_title">Install <xliff:g id="name" example="Calendar">%1$s</xliff:g> in your personal profile</string>









    The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=NONE]-->









    <string name="interact_across_profiles_install_personal_app_title">Install personal <xliff:g id="name" example="Calendar">%1$s</xliff:g> to connect these apps</string>

















    <!-- Banner text. This banner lets a user know that they need to install an app in their









    personal profile in order to connect it to the corresponding work app.









    work/personal profile in order to connect it to the corresponding personal app.









    The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=NONE]-->









    <string name="interact_across_profiles_install_personal_app_summary">To connect these apps, install the <xliff:g id="name" example="Calendar">%1$s</xliff:g> app in your personal profile</string>

















    <!-- Button text. This button takes a user to the app store so they can download and









    install the app they need. [CHAR LIMIT=50]-->









    <string name="interact_across_profiles_install_app_action">Get the app</string>









    <string name="interact_across_profiles_install_app_summary">Tap to get the app</string>

















    <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->









    <string name="manage_zen_access_title">Do Not Disturb access</string>

























res/xml/interact_across_profiles_permissions_details.xml



+19
−13






























Original line number
Diff line number
Diff line







@@ -15,7 +15,8 @@







  ~ limitations under the License.









  -->



















<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"









<PreferenceScreen









    xmlns:android="http://schemas.android.com/apk/res/android"









    android:title="@string/interact_across_profiles_title">



















        <com.android.settingslib.widget.LayoutPreference








@@ -23,7 +24,12 @@







            android:layout="@layout/cross_profiles_settings_entity_header"









            android:selectable="false"/>



















    <SwitchPreference









        <com.android.settings.widget.CardPreference









            android:key="install_app_banner"









            android:icon="@drawable/ic_download_for_offline"









            android:gravity="top"/>



















        <com.android.settingslib.RestrictedSwitchPreference









            android:key="interact_across_profiles_settings_switch" />



















        <Preference
































src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java



+224
−60






























Original line number
Diff line number
Diff line







@@ -15,15 +15,25 @@







 */









package com.android.settings.applications.specialaccess.interactacrossprofiles;



















import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;









import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;



















import android.Manifest;









import android.annotation.UserIdInt;









import android.app.ActionBar;









import android.app.AppOpsManager;









import android.app.admin.DevicePolicyManager;









import android.app.settings.SettingsEnums;









import android.content.Context;









import android.content.DialogInterface;









import android.content.Intent;









import android.content.PermissionChecker;









import android.content.pm.CrossProfileApps;









import android.content.pm.PackageInfo;









import android.content.pm.PackageManager;









import android.content.pm.UserInfo;









import android.graphics.ColorMatrix;









import android.graphics.ColorMatrixColorFilter;









import android.graphics.drawable.Drawable;









import android.os.Bundle;









import android.os.UserHandle;









import android.os.UserManager;








@@ -32,13 +42,15 @@ import android.view.View;







import android.widget.ImageView;









import android.widget.TextView;



















import androidx.annotation.Nullable;









import androidx.appcompat.app.AlertDialog;









import androidx.preference.Preference;









import androidx.preference.SwitchPreference;



















import com.android.settings.R;









import com.android.settings.applications.AppInfoBase;









import com.android.settings.applications.AppStoreUtil;









import com.android.settings.widget.CardPreference;









import com.android.settingslib.RestrictedLockUtils;









import com.android.settingslib.RestrictedSwitchPreference;









import com.android.settingslib.widget.LayoutPreference;



















public class InteractAcrossProfilesDetails extends AppInfoBase








@@ -47,13 +59,21 @@ public class InteractAcrossProfilesDetails extends AppInfoBase







    private static final String INTERACT_ACROSS_PROFILES_SETTINGS_SWITCH =









            "interact_across_profiles_settings_switch";









    private static final String INTERACT_ACROSS_PROFILES_HEADER = "interact_across_profiles_header";









    public static final String INSTALL_APP_BANNER_KEY = "install_app_banner";



















    private Context mContext;









    private CrossProfileApps mCrossProfileApps;









    private UserManager mUserManager;









    private SwitchPreference mSwitchPref;









    private RestrictedSwitchPreference mSwitchPref;









    private LayoutPreference mHeader;









    private CardPreference mInstallBanner;









    private PackageManager mPackageManager;









    private UserHandle mPersonalProfile;









    private UserHandle mWorkProfile;









    private boolean mInstalledInPersonal;









    private boolean mInstalledInWork;









    private String mAppLabel;









    private Intent mInstallAppIntent;



















    @Override









    public void onCreate(Bundle savedInstanceState) {








@@ -64,19 +84,30 @@ public class InteractAcrossProfilesDetails extends AppInfoBase







        mUserManager = mContext.getSystemService(UserManager.class);









        mPackageManager = mContext.getPackageManager();



















        mWorkProfile = InteractAcrossProfilesSettings.getWorkProfile(mUserManager);









        mPersonalProfile = mUserManager.getProfileParent(mWorkProfile);









        mInstalledInWork = isPackageInstalled(mPackageName, mWorkProfile.getIdentifier());









        mInstalledInPersonal = isPackageInstalled(mPackageName, mPersonalProfile.getIdentifier());



















        mAppLabel = mPackageInfo.applicationInfo.loadLabel(mPackageManager).toString();









        mInstallAppIntent = AppStoreUtil.getAppStoreLink(mContext, mPackageName);



















        addPreferencesFromResource(R.xml.interact_across_profiles_permissions_details);









        mSwitchPref = findPreference(INTERACT_ACROSS_PROFILES_SETTINGS_SWITCH);









        mSwitchPref.setOnPreferenceClickListener(this);



















        mHeader = findPreference(INTERACT_ACROSS_PROFILES_HEADER);



















        mInstallBanner = findPreference(INSTALL_APP_BANNER_KEY);









        mInstallBanner.setOnPreferenceClickListener(this);



















        // refreshUi checks that the user can still configure the appOp, return to the









        // previous page if it can't.









        if (!refreshUi()) {









            setIntentAndFinish(true/* appChanged */);









        }









        final UserHandle workProfile = getWorkProfile();









        final UserHandle personalProfile = mUserManager.getProfileParent(workProfile);









        addAppTitleAndIcons(personalProfile, workProfile);









        addAppTitleAndIcons(mPersonalProfile, mWorkProfile);









        styleActionBar();









    }



















    private void addAppTitleAndIcons(UserHandle personalProfile, UserHandle workProfile) {








@@ -89,70 +120,101 @@ public class InteractAcrossProfilesDetails extends AppInfoBase

















        final ImageView personalIconView = mHeader.findViewById(R.id.entity_header_icon_personal);









        if (personalIconView != null) {









            personalIconView.setImageDrawable(IconDrawableFactory.newInstance(mContext)









                    .getBadgedIcon(mPackageInfo.applicationInfo, personalProfile.getIdentifier()));









            Drawable icon = IconDrawableFactory.newInstance(mContext)









                    .getBadgedIcon(mPackageInfo.applicationInfo, personalProfile.getIdentifier())









                    .mutate();









            if (!mInstalledInPersonal) {









                icon.setColorFilter(createSuspendedColorMatrix());









            }









        final ImageView workIconView2 = mHeader.findViewById(R.id.entity_header_icon_work);









        if (workIconView2 != null) {









            workIconView2.setImageDrawable(IconDrawableFactory.newInstance(mContext)









                    .getBadgedIcon(mPackageInfo.applicationInfo, workProfile.getIdentifier()));









            personalIconView.setImageDrawable(icon);









        }



















        final ImageView workIconView = mHeader.findViewById(R.id.entity_header_icon_work);









        if (workIconView != null) {









            Drawable icon = IconDrawableFactory.newInstance(mContext)









                    .getBadgedIcon(mPackageInfo.applicationInfo, workProfile.getIdentifier())









                    .mutate();









            if (!mInstalledInWork) {









                icon.setColorFilter(createSuspendedColorMatrix());









            }









            workIconView.setImageDrawable(icon);









        }









    }



















    @Nullable









    private UserHandle getWorkProfile() {









        for (UserInfo user : mUserManager.getProfiles(UserHandle.myUserId())) {









            if (mUserManager.isManagedProfile(user.id)) {









                return user.getUserHandle();









    private void styleActionBar() {









        final ActionBar actionBar = getActivity().getActionBar();









        if (actionBar != null) {









            actionBar.setElevation(0);









        }









    }









        return null;



















    private ColorMatrixColorFilter createSuspendedColorMatrix() {









        int grayValue = 127;









        float scale = 0.5f; // half bright



















        ColorMatrix tempBrightnessMatrix = new ColorMatrix();









        float[] mat = tempBrightnessMatrix.getArray();









        mat[0] = scale;









        mat[6] = scale;









        mat[12] = scale;









        mat[4] = grayValue;









        mat[9] = grayValue;









        mat[14] = grayValue;



















        ColorMatrix matrix = new ColorMatrix();









        matrix.setSaturation(0.0f);









        matrix.preConcat(tempBrightnessMatrix);









        return new ColorMatrixColorFilter(matrix);









    }



















    @Override









    public boolean onPreferenceClick(Preference preference) {









        if (preference != mSwitchPref) {









            return false;









        }









        // refreshUi checks that the user can still configure the appOp, return to the









        // previous page if it can't.









        if (!refreshUi()) {









            setIntentAndFinish(true/* appChanged */);









        }









        if (preference == mSwitchPref) {









            handleSwitchPreferenceClick();









            return true;









        }









        if (preference == mInstallBanner) {









            handleInstallBannerClick();









            return true;









        }









        return false;









    }



















    private void handleSwitchPreferenceClick() {









        if (isInteractAcrossProfilesEnabled()) {









            enableInteractAcrossProfiles(false);









            refreshUi();









            return true;









        }









        if (!isInteractAcrossProfilesEnabled()) {









        } else {









            showConsentDialog();









        }









        return true;









    }



















    private void showConsentDialog() {









        final String appLabel = mPackageInfo.applicationInfo.loadLabel(mPackageManager).toString();



















        final View dialogView = getLayoutInflater().inflate(









                R.layout.interact_across_profiles_consent_dialog, null);



















        final TextView dialogTitle = dialogView.findViewById(









                R.id.interact_across_profiles_consent_dialog_title);









        dialogTitle.setText(









                getString(R.string.interact_across_profiles_consent_dialog_title, appLabel));









                getString(R.string.interact_across_profiles_consent_dialog_title, mAppLabel));



















        final TextView dialogSummary = dialogView.findViewById(









                R.id.interact_across_profiles_consent_dialog_summary);









        dialogSummary.setText(









                getString(R.string.interact_across_profiles_consent_dialog_summary, appLabel));









                getString(R.string.interact_across_profiles_consent_dialog_summary, mAppLabel));



















        final TextView appDataSummary = dialogView.findViewById(R.id.app_data_summary);









        appDataSummary.setText(getString(









                R.string.interact_across_profiles_consent_dialog_app_data_summary, appLabel));









                R.string.interact_across_profiles_consent_dialog_app_data_summary, mAppLabel));



















        final TextView permissionsSummary = dialogView.findViewById(R.id.permissions_summary);









        permissionsSummary.setText(getString(









                R.string.interact_across_profiles_consent_dialog_permissions_summary, appLabel));









                R.string.interact_across_profiles_consent_dialog_permissions_summary, mAppLabel));



















        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());









        builder.setView(dialogView)








@@ -171,11 +233,31 @@ public class InteractAcrossProfilesDetails extends AppInfoBase







    }



















    private boolean isInteractAcrossProfilesEnabled() {









        return isInteractAcrossProfilesEnabled(









                mContext, mPackageName, mPackageInfo.applicationInfo.uid);









        return isInteractAcrossProfilesEnabled(mContext, mPackageName);









    }



















    static boolean isInteractAcrossProfilesEnabled(









            Context context, String packageName) {









        UserManager userManager = context.getSystemService(UserManager.class);









        UserHandle workProfile = InteractAcrossProfilesSettings.getWorkProfile(userManager);









        UserHandle personalProfile = userManager.getProfileParent(workProfile);









        return context.getSystemService(









                CrossProfileApps.class).canConfigureInteractAcrossProfiles(packageName)









                && isInteractAcrossProfilesEnabledInProfile(context, packageName, personalProfile)









                && isInteractAcrossProfilesEnabledInProfile(context, packageName, workProfile);



















    }



















    static boolean isInteractAcrossProfilesEnabled(Context context, String packageName, int uid) {









    private static boolean isInteractAcrossProfilesEnabledInProfile(









            Context context, String packageName, UserHandle userHandle) {









        final PackageManager packageManager = context.getPackageManager();









        final int uid;









        try {









            uid = packageManager.getApplicationInfoAsUser(









                    packageName, /* flags= */0, userHandle).uid;









        } catch (PackageManager.NameNotFoundException e) {









            return false;









        }









        return PermissionChecker.PERMISSION_GRANTED









                == PermissionChecker.checkPermissionForPreflight(









                context,








@@ -190,14 +272,28 @@ public class InteractAcrossProfilesDetails extends AppInfoBase







                mPackageName, newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);









    }



















    private void handleInstallBannerClick() {









        if (mInstallAppIntent == null) {









            return;









        }









        if (!mInstalledInWork) {









            mContext.startActivityAsUser(mInstallAppIntent, mWorkProfile);









            return;









        }









        if (!mInstalledInPersonal) {









            mContext.startActivityAsUser(mInstallAppIntent, mPersonalProfile);









        }









    }



















    /**









     * @return the summary for the current state of whether the app associated with the given









     * {@code packageName} is allowed to interact across profiles.









     */









    public static CharSequence getPreferenceSummary(Context context, String packageName, int uid) {









        return context.getString(isInteractAcrossProfilesEnabled(context, packageName, uid)









                ? R.string.app_permission_summary_allowed









                : R.string.app_permission_summary_not_allowed);









    public static CharSequence getPreferenceSummary(









            Context context, String packageName) {









        return context.getString(isInteractAcrossProfilesEnabled(context, packageName)









                ? R.string.interact_across_profiles_summary_allowed









                : R.string.interact_across_profiles_summary_not_allowed);









    }



















    @Override








@@ -205,30 +301,98 @@ public class InteractAcrossProfilesDetails extends AppInfoBase







        if (mPackageInfo == null || mPackageInfo.applicationInfo == null) {









            return false;









        }









        if (!mCrossProfileApps.canConfigureInteractAcrossProfiles(mPackageName)) {









        if (!mCrossProfileApps.canUserAttemptToConfigureInteractAcrossProfiles(mPackageName)) {









            // Invalid app entry. Should not allow changing permission









            mSwitchPref.setEnabled(false);









            return false;









        }









        if (!mCrossProfileApps.canConfigureInteractAcrossProfiles(mPackageName)) {









            return refreshUiForNonConfigurableApps();









        }









        refreshUiForConfigurableApps();









        return true;









    }



















        final ImageView horizontalArrowIcon = mHeader.findViewById(R.id.entity_header_swap_horiz);









    private boolean refreshUiForNonConfigurableApps() {









        mSwitchPref.setChecked(false);









        mSwitchPref.setTitle(R.string.interact_across_profiles_switch_disabled);









        if (!isCrossProfilePackageWhitelisted(mPackageName)) {









            mInstallBanner.setVisible(false);









            mSwitchPref.setDisabledByAdmin(RestrictedLockUtils.getProfileOrDeviceOwner(









                    mContext, mWorkProfile));









            return true;









        }









        mSwitchPref.setEnabled(false);









        if (!mInstalledInPersonal && !mInstalledInWork) {









            return false;









        }









        if (!mInstalledInPersonal) {









            mInstallBanner.setTitle(getString(









                    R.string.interact_across_profiles_install_personal_app_title,









                    mAppLabel));









            mInstallBanner.setSummary(









                    R.string.interact_across_profiles_install_app_summary);









            mInstallBanner.setVisible(true);









            return true;









        }









        if (!mInstalledInWork) {









            mInstallBanner.setTitle(getString(









                    R.string.interact_across_profiles_install_work_app_title,









                    mAppLabel));









            mInstallBanner.setSummary(









                    R.string.interact_across_profiles_install_app_summary);









            mInstallBanner.setVisible(true);









            return true;









        }









        return false;









    }



















    private boolean isCrossProfilePackageWhitelisted(String packageName) {









        return mContext.getSystemService(DevicePolicyManager.class)









                .getAllCrossProfilePackages().contains(packageName);









    }



















    private boolean isPackageInstalled(String packageName, @UserIdInt int userId) {









        final PackageInfo info;









        try {









            info = mContext.createContextAsUser(UserHandle.of(userId), /* flags= */0)









                    .getPackageManager().getPackageInfo(packageName,









                            MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE);









        } catch (PackageManager.NameNotFoundException e) {









            return false;









        }









        return info != null;









    }



















    private void refreshUiForConfigurableApps() {









        mInstallBanner.setVisible(false);









        mSwitchPref.setEnabled(true);









        if (isInteractAcrossProfilesEnabled()) {









            enableSwitchPref();









        } else {









            disableSwitchPref();









        }









    }



















    private void enableSwitchPref() {









        mSwitchPref.setChecked(true);









        mSwitchPref.setTitle(R.string.interact_across_profiles_switch_enabled);









        final ImageView horizontalArrowIcon = mHeader.findViewById(R.id.entity_header_swap_horiz);









        if (horizontalArrowIcon != null) {









            horizontalArrowIcon.setImageDrawable(









                    mContext.getDrawable(R.drawable.ic_swap_horiz_blue));









        }









        } else {









    }



















    private void disableSwitchPref() {









        mSwitchPref.setChecked(false);









        mSwitchPref.setTitle(R.string.interact_across_profiles_switch_disabled);









        final ImageView horizontalArrowIcon = mHeader.findViewById(R.id.entity_header_swap_horiz);









        if (horizontalArrowIcon != null) {









            horizontalArrowIcon.setImageDrawable(









                    mContext.getDrawable(R.drawable.ic_swap_horiz_grey));









        }









    }









        return true;









    }



















    @Override









    protected AlertDialog createDialog(int id, int errorCode) {
































src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetailsPreferenceController.java



+4
−5






























Original line number
Diff line number
Diff line







@@ -35,7 +35,7 @@ public class InteractAcrossProfilesDetailsPreferenceController

















    @Override









    public int getAvailabilityStatus() {









        return canConfigureInteractAcrossProfiles() ? AVAILABLE : DISABLED_FOR_USER;









        return canUserAttemptToConfigureInteractAcrossProfiles() ? AVAILABLE : DISABLED_FOR_USER;









    }



















    @Override








@@ -49,13 +49,12 @@ public class InteractAcrossProfilesDetailsPreferenceController







    }



















    private CharSequence getPreferenceSummary() {









        return InteractAcrossProfilesDetails.getPreferenceSummary(mContext, mPackageName,









                mParent.getPackageInfo().applicationInfo.uid);









        return InteractAcrossProfilesDetails.getPreferenceSummary(mContext, mPackageName);









    }



















    private boolean canConfigureInteractAcrossProfiles() {









    private boolean canUserAttemptToConfigureInteractAcrossProfiles() {









        return mContext.getSystemService(CrossProfileApps.class)









                .canConfigureInteractAcrossProfiles(mPackageName);









                .canUserAttemptToConfigureInteractAcrossProfiles(mPackageName);









    }



















    public void setPackageName(String packageName) {