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

Commit 0e8e01ef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Changed CarUserSwitching UI to show which user is loading."

parents c438b23f effa2cd7

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

+10 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.graphics.Rect; 
import android.graphics.RectF;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.os.UserManager;

import android.view.LayoutInflater;

import android.view.View;
@@ -81,8 +82,15 @@ 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: use developer settings instead

        if (Build.IS_DEBUGGABLE) {

            // TODO: use specific string

            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);

    }