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

Commit 9a1928ea authored by Fan Zhang's avatar Fan Zhang
Browse files

Move profile selector dialog to Settings 

Bug: 77600770
Test: robotest
Change-Id: I601dabfd925a1990b7bd9115ef579bff9039a7c0
parent b4c610b9

src/com/android/settings/dashboard/CategoryManager.java

+0 −11
Original line number Diff line number Diff line
@@ -216,15 +216,4 @@ public class CategoryManager { 
            }

        }

    }



    /**

     * Sort priority value for tiles within a single {@code DashboardCategory}.

     *

     * @see #sortCategories(Context, Map)

     */

    private synchronized void sortCategoriesForExternalTiles(Context context,

            DashboardCategory dashboardCategory) {

        dashboardCategory.sortTiles(context.getPackageName());



    }

}

src/com/android/settings/dashboard/DashboardAdapter.java

+5 −5
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ import android.widget.ImageView; 
import android.widget.LinearLayout;

import android.widget.TextView;



import androidx.annotation.VisibleForTesting;

import androidx.recyclerview.widget.DiffUtil;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.R.id;
@@ -51,11 +56,6 @@ import com.android.settingslib.utils.IconCache; 


import java.util.List;



import androidx.annotation.VisibleForTesting;

import androidx.recyclerview.widget.DiffUtil;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;



public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.DashboardItemHolder>

        implements SummaryLoader.SummaryConsumer, SuggestionAdapter.Callback, LifecycleObserver,

        OnSaveInstanceState {

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ import androidx.preference.Preference; 
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.dashboard.profileselector.ProfileSelectDialog;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;

import com.android.settingslib.drawer.DashboardCategory;

import com.android.settingslib.drawer.ProfileSelectDialog;

import com.android.settingslib.drawer.Tile;

import com.android.settingslib.drawer.TileUtils;

import com.android.settingslib.utils.ThreadUtils;
@@ -92,7 +92,7 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { 
        }

        final List<Tile> tiles = category.getTiles();

        if (tiles == null || tiles.isEmpty()) {

            Log.d(TAG, "tile list is empty, skipping category " + category.title);

            Log.d(TAG, "tile list is empty, skipping category " + category.key);

            return null;

        }

        final List<Preference> preferences = new ArrayList<>();

src/com/android/settings/dashboard/DashboardFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment 
        }

        final List<Tile> tiles = category.getTiles();

        if (tiles == null) {

            Log.d(TAG, "tile list is empty, skipping category " + category.title);

            Log.d(TAG, "tile list is empty, skipping category " + category.key);

            return;

        }

        // Create a list to track which tiles are to be removed.

src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java

0 → 100644
+93 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 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.

 */



package com.android.settings.dashboard.profileselector;



import android.app.AlertDialog;

import android.app.Dialog;

import android.app.DialogFragment;

import android.app.FragmentManager;

import android.content.Context;

import android.content.DialogInterface;

import android.content.DialogInterface.OnClickListener;

import android.content.Intent;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;



import com.android.settingslib.drawer.Tile;



import java.util.List;



public class ProfileSelectDialog extends DialogFragment implements OnClickListener {



    private static final String TAG = "ProfileSelectDialog";

    private static final String ARG_SELECTED_TILE = "selectedTile";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    private Tile mSelectedTile;



    public static void show(FragmentManager manager, Tile tile) {

        ProfileSelectDialog dialog = new ProfileSelectDialog();

        Bundle args = new Bundle();

        args.putParcelable(ARG_SELECTED_TILE, tile);

        dialog.setArguments(args);

        dialog.show(manager, "select_profile");

    }



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        mSelectedTile = getArguments().getParcelable(ARG_SELECTED_TILE);

    }



    @Override

    public Dialog onCreateDialog(Bundle savedInstanceState) {

        Context context = getActivity();

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

        UserAdapter adapter = UserAdapter.createUserAdapter(UserManager.get(context), context,

                mSelectedTile.userHandle);

        builder.setTitle(com.android.settingslib.R.string.choose_profile)

                .setAdapter(adapter, this);



        return builder.create();

    }



    @Override

    public void onClick(DialogInterface dialog, int which) {

        UserHandle user = mSelectedTile.userHandle.get(which);

        // Show menu on top level items.

        mSelectedTile.intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);

        getActivity().startActivityAsUser(mSelectedTile.intent, user);

    }



    public static void updateUserHandlesIfNeeded(Context context, Tile tile) {

        List<UserHandle> userHandles = tile.userHandle;

        if (tile.userHandle == null || tile.userHandle.size() <= 1) {

            return;

        }

        final UserManager userManager = UserManager.get(context);

        for (int i = userHandles.size() - 1; i >= 0; i--) {

            if (userManager.getUserInfo(userHandles.get(i).getIdentifier()) == null) {

                if (DEBUG) {

                    Log.d(TAG, "Delete the user: " + userHandles.get(i).getIdentifier());

                }

                userHandles.remove(i);

            }

        }

    }

}