Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make switching dialog full screen and change "Loading" text color." into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-12 21:14:21 +00:00
committed by Android (Google) Code Review
parent 718b4fd970 c4808d9a4b
commit c2daf3cbb2
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/res/res/layout/car_user_switching_dialog.xml
View File

@@ -16,25 +16,22 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content">
>
<ImageView <ImageView
android:id="@+id/user_loading_avatar" android:id="@+id/user_loading_avatar"
android:layout_width="@dimen/car_fullscreen_user_pod_image_avatar_width" android:layout_width="@dimen/car_fullscreen_user_pod_image_avatar_width"
android:layout_height="@dimen/car_fullscreen_user_pod_image_avatar_height" android:layout_height="@dimen/car_fullscreen_user_pod_image_avatar_height"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"/>
/>
<TextView android:id="@+id/user_loading" <TextView android:id="@+id/user_loading"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/car_padding_4" android:layout_marginTop="@dimen/car_padding_4"
android:textSize="@dimen/car_body1_size" android:textSize="@dimen/car_body1_size"
android:textColor="@color/car_body1_light" android:textColor="@color/car_body1"
android:layout_below="@id/user_loading_avatar" android:layout_below="@id/user_loading_avatar"
android:gravity="center" android:gravity="center"/>
/>
</RelativeLayout> </RelativeLayout>

3
services/core/java/com/android/server/am/CarUserSwitchingDialog.java
View File

@@ -30,7 +30,6 @@ import android.graphics.PorterDuff;
import android.graphics.PorterDuffXfermode; import android.graphics.PorterDuffXfermode;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.RectF; import android.graphics.RectF;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.UserManager; import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
@@ -57,8 +56,6 @@ final class CarUserSwitchingDialog extends UserSwitchingDialog {
String switchingToSystemUserMessage) { String switchingToSystemUserMessage) {
super(service, context, oldUser, newUser, aboveSystem, switchingFromSystemUserMessage, super(service, context, oldUser, newUser, aboveSystem, switchingFromSystemUserMessage,
switchingToSystemUserMessage); switchingToSystemUserMessage);
getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
} }
@Override @Override