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

Commit a7639c6f authored by Ale Nijamkin's avatar Ale Nijamkin
Browse files

[conflict] Merge changes Ia5df853c,Idf15ff5d,I383f1bb9,I0d6a8e4f into... 

[conflict] Merge changes Ia5df853c,Idf15ff5d,I383f1bb9,I0d6a8e4f into tm-qpr-dev am: f2ac298a am: ace939f2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969222



Change-Id: Iac262f7268a55a3912b678da047fbc9ef2d7eb9c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 046b82e9 ace939f2

packages/SystemUI/ktfmt_includes.txt

+2 −2
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ 
-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/PanelExpansionStateManagerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherControllerOldImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositoryImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractorTest.kt
@@ -828,7 +828,7 @@ 
-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcherAdapterTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisablerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SafetyControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerOldImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/VariableDateViewControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/WalletControllerImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/window/StatusBarWindowStateControllerTest.kt

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+3 −6
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import static android.view.WindowInsets.Type.systemBars; 
import static android.view.WindowInsetsAnimation.Callback.DISPATCH_MODE_STOP;



import static com.android.systemui.plugins.FalsingManager.LOW_PENALTY;

import static com.android.systemui.statusbar.policy.UserSwitcherController.USER_SWITCH_DISABLED_ALPHA;

import static com.android.systemui.statusbar.policy.UserSwitcherController.USER_SWITCH_ENABLED_ALPHA;



import static java.lang.Integer.max;
@@ -87,8 +85,8 @@ import com.android.systemui.R; 
import com.android.systemui.animation.Interpolators;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.shared.system.SysUiStatsLog;

import com.android.systemui.statusbar.policy.BaseUserSwitcherAdapter;

import com.android.systemui.statusbar.policy.UserSwitcherController;

import com.android.systemui.statusbar.policy.UserSwitcherController.BaseUserAdapter;

import com.android.systemui.user.data.source.UserRecord;

import com.android.systemui.util.settings.GlobalSettings;
@@ -1137,7 +1135,7 @@ public class KeyguardSecurityContainer extends FrameLayout { 


            KeyguardUserSwitcherAnchor anchor = mView.findViewById(R.id.user_switcher_anchor);



            BaseUserAdapter adapter = new BaseUserAdapter(mUserSwitcherController) {

            BaseUserSwitcherAdapter adapter = new BaseUserSwitcherAdapter(mUserSwitcherController) {

                @Override

                public View getView(int position, View convertView, ViewGroup parent) {

                    UserRecord item = getItem(position);
@@ -1172,8 +1170,7 @@ public class KeyguardSecurityContainer extends FrameLayout { 
                    }

                    textView.setSelected(item == currentUser);

                    view.setEnabled(item.isSwitchToEnabled);

                    view.setAlpha(view.isEnabled() ? USER_SWITCH_ENABLED_ALPHA :

                            USER_SWITCH_DISABLED_ALPHA);

                    UserSwitcherController.setSelectableAlpha(view);

                    return view;

                }

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ public class Flags { 
    public static final UnreleasedFlag MODERN_USER_SWITCHER_ACTIVITY =

            new UnreleasedFlag(209, true);



    /** Whether the new implementation of UserSwitcherController should be used. */

    public static final UnreleasedFlag REFACTORED_USER_SWITCHER_CONTROLLER =

            new UnreleasedFlag(210, false);



    /***************************************/

    // 300 - power menu

    public static final ReleasedFlag POWER_MENU_LITE =

packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java

+4 −5
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.systemui.qs.tiles;



import static com.android.systemui.statusbar.policy.UserSwitcherController.USER_SWITCH_DISABLED_ALPHA;

import static com.android.systemui.statusbar.policy.UserSwitcherController.USER_SWITCH_ENABLED_ALPHA;



import android.content.Context;

import android.content.Intent;

import android.graphics.drawable.Drawable;
@@ -42,6 +39,7 @@ import com.android.systemui.qs.PseudoGridView; 
import com.android.systemui.qs.QSUserSwitcherEvent;

import com.android.systemui.qs.user.UserSwitchDialogController;

import com.android.systemui.statusbar.phone.SystemUIDialog;

import com.android.systemui.statusbar.policy.BaseUserSwitcherAdapter;

import com.android.systemui.statusbar.policy.UserSwitcherController;

import com.android.systemui.user.data.source.UserRecord;
@@ -73,7 +71,8 @@ public class UserDetailView extends PseudoGridView { 
        mAdapter.refresh();

    }



    public static class Adapter extends UserSwitcherController.BaseUserAdapter

    /** Provides views for user detail items. */

    public static class Adapter extends BaseUserSwitcherAdapter

            implements OnClickListener {



        private final Context mContext;
@@ -137,7 +136,7 @@ public class UserDetailView extends PseudoGridView { 
            v.setActivated(item.isCurrent);

            v.setDisabledByAdmin(mController.isDisabledByAdmin(item));

            v.setEnabled(item.isSwitchToEnabled);

            v.setAlpha(v.isEnabled() ? USER_SWITCH_ENABLED_ALPHA : USER_SWITCH_DISABLED_ALPHA);

            UserSwitcherController.setSelectableAlpha(v);



            if (item.isCurrent) {

                mCurrentUserView = v;

packages/SystemUI/src/com/android/systemui/statusbar/UserUtil.java

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.systemui.statusbar;



import android.content.Context;

import android.content.DialogInterface;



import com.android.systemui.R;

import com.android.systemui.statusbar.phone.SystemUIDialog;

import com.android.systemui.statusbar.policy.UserSwitcherController;



public class UserUtil {

    public static void deleteUserWithPrompt(Context context, int userId,

                                            UserSwitcherController userSwitcherController) {

        new RemoveUserDialog(context, userId, userSwitcherController).show();

    }



    private final static class RemoveUserDialog extends SystemUIDialog implements

            DialogInterface.OnClickListener {



        private final int mUserId;

        private final UserSwitcherController mUserSwitcherController;



        public RemoveUserDialog(Context context, int userId,

                                UserSwitcherController userSwitcherController) {

            super(context);

            setTitle(R.string.user_remove_user_title);

            setMessage(context.getString(R.string.user_remove_user_message));

            setButton(DialogInterface.BUTTON_NEUTRAL,

                    context.getString(android.R.string.cancel), this);

            setButton(DialogInterface.BUTTON_POSITIVE,

                    context.getString(R.string.user_remove_user_remove), this);

            setCanceledOnTouchOutside(false);

            mUserId = userId;

            mUserSwitcherController = userSwitcherController;

        }



        @Override

        public void onClick(DialogInterface dialog, int which) {

            if (which == BUTTON_NEUTRAL) {

                cancel();

            } else {

                dismiss();

                mUserSwitcherController.removeUserId(mUserId);

            }

        }

    }

}