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

Commit 2f492876 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support the managed profile deep links for large screen" into tm-dev am: 9c3c55ec 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356912



Change-Id: I18de4f3910d96ea7923a97508d8a7403eae7daa5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1c5627c 9c3c55ec

src/com/android/settings/SettingsActivity.java

+11 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.content.SharedPreferences; 
import android.content.pm.ActivityInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.content.res.Resources.Theme;

import android.graphics.drawable.Icon;
@@ -152,6 +153,8 @@ public class SettingsActivity extends SettingsBaseActivity 
     */

    public static final String EXTRA_IS_FROM_SLICE = "is_from_slice";



    public static final String EXTRA_USER_HANDLE = "user_handle";



    /**

     * Personal or Work profile tab of {@link ProfileSelectFragment}

     * <p>0: Personal tab.
@@ -427,7 +430,14 @@ public class SettingsActivity extends SettingsBaseActivity 
        }



        try {

            final UserManager um = getSystemService(UserManager.class);

            final UserInfo userInfo = um.getUserInfo(getUser().getIdentifier());

            if (userInfo.isManagedProfile()) {

                trampolineIntent.putExtra(EXTRA_USER_HANDLE, getUser());

                startActivityAsUser(trampolineIntent, um.getPrimaryUser().getUserHandle());

            } else {

                startActivity(trampolineIntent);

            }

        } catch (ActivityNotFoundException e) {

            Log.e(LOG_TAG, "Deep link homepage is not available to show 2-pane UI");

            return false;

src/com/android/settings/homepage/SettingsHomepageActivity.java

+10 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import static android.provider.Settings.ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY 
import static android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY;

import static android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI;



import static com.android.settings.SettingsActivity.EXTRA_USER_HANDLE;



import android.animation.LayoutTransition;

import android.app.ActivityManager;

import android.app.settings.SettingsEnums;
@@ -27,6 +29,7 @@ import android.content.ComponentName; 
import android.content.Intent;

import android.content.res.Configuration;

import android.os.Bundle;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.FeatureFlagUtils;
@@ -449,8 +452,14 @@ public class SettingsHomepageActivity extends FragmentActivity implements 
                SplitRule.FINISH_ALWAYS,

                SplitRule.FINISH_ALWAYS,

                true /* clearTop */);



        final UserHandle user = intent.getParcelableExtra(EXTRA_USER_HANDLE, UserHandle.class);

        if (user != null) {

            startActivityAsUser(targetIntent, user);

        } else {

            startActivity(targetIntent);

        }

    }



    private String getHighlightMenuKey() {

        final Intent intent = getIntent();