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

Commit d29f0a6c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Adding option in global setting to control the display message during user switch am: a9feb460 

Change-Id: Ie5774f939a4df6d7de7f4ca885c0c9215e6722a7
parents d7c39e5c a9feb460

services/core/java/com/android/server/am/CarUserSwitchingDialog.java

+14 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.graphics.RectF; 
import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.os.UserManager;

import android.provider.Settings;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.ImageView;
@@ -81,8 +82,19 @@ final class CarUserSwitchingDialog extends UserSwitchingDialog { 
                    .setImageDrawable(drawable);

        }



        ((TextView) view.findViewById(R.id.user_loading))

                .setText(res.getString(R.string.car_loading_profile));

        TextView msgView = view.findViewById(R.id.user_loading);



        // TODO(b/145132885): use constant from CarSettings

        boolean showInfo = "true".equals(Settings.Global.getString(

                getContext().getContentResolver(),

                "android.car.ENABLE_USER_SWITCH_DEVELOPER_MESSAGE"));



        if (showInfo) {

            msgView.setText(res.getString(R.string.car_loading_profile) + " user\n(from "

                    + mOldUser.id + " to " + mNewUser.id + ")");

        } else {

            msgView.setText(res.getString(R.string.car_loading_profile));

        }

        setView(view);

    }