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

Commit 4cbe7526 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make switching dialog full screen and change "Loading" text color."...

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

Change-Id: I2ccc76bdf5fd7da3496352621db3afdbd32260bc
parents 050d6c11 c2daf3cb
Loading
Loading
Loading
Loading
+5 −8
Original line number Diff line number Diff line
@@ -16,25 +16,22 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:fitsSystemWindows="true"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    >
    android:layout_width="wrap_content"
    android:layout_height="wrap_content">

  <ImageView
      android:id="@+id/user_loading_avatar"
      android:layout_width="@dimen/car_fullscreen_user_pod_image_avatar_width"
      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"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:layout_marginTop="@dimen/car_padding_4"
      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:gravity="center"
  />
      android:gravity="center"/>

</RelativeLayout>
 No newline at end of file
+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.graphics.PorterDuff;
import android.graphics.PorterDuffXfermode;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.UserManager;
import android.provider.Settings;
@@ -57,8 +56,6 @@ final class CarUserSwitchingDialog extends UserSwitchingDialog {
            String switchingToSystemUserMessage) {
        super(service, context, oldUser, newUser, aboveSystem, switchingFromSystemUserMessage,
                switchingToSystemUserMessage);

        getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
    }

    @Override