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

Commit 92a72a71 authored by Massimo Carli's avatar Massimo Carli Committed by Automerger Merge Worker
Browse files

Merge "[1/n] Move Letterbox education dialog classes" into tm-qpr-dev am: 812e3291 am: 04378e03 

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



Change-Id: I2aabe48c91e2ef985eeff5db8a42454cb62aed0f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f35768e3 04378e03

libs/WindowManager/Shell/res/layout/letterbox_education_dialog_layout.xml

+5 −5
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2022 The Android Open Source Project

  ~ Copyright (C) 2023 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.
@@ -13,7 +13,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.android.wm.shell.compatui.letterboxedu.LetterboxEduDialogLayout

<com.android.wm.shell.compatui.LetterboxEduDialogLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    style="@style/LetterboxDialog">
@@ -78,13 +78,13 @@ 
                    android:orientation="horizontal"

                    android:paddingTop="48dp">



                    <com.android.wm.shell.compatui.letterboxedu.LetterboxEduDialogActionLayout

                    <com.android.wm.shell.compatui.LetterboxEduDialogActionLayout

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        app:icon="@drawable/letterbox_education_ic_reposition"

                        app:text="@string/letterbox_education_reposition_text"/>



                    <com.android.wm.shell.compatui.letterboxedu.LetterboxEduDialogActionLayout

                    <com.android.wm.shell.compatui.LetterboxEduDialogActionLayout

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_marginStart=
@@ -118,4 +118,4 @@ 


    </FrameLayout>



</com.android.wm.shell.compatui.letterboxedu.LetterboxEduDialogLayout>
 
</com.android.wm.shell.compatui.LetterboxEduDialogLayout>

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import com.android.wm.shell.common.DockStateReader; 
import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.SyncTransactionQueue;

import com.android.wm.shell.compatui.CompatUIWindowManager.CompatUIHintsState;

import com.android.wm.shell.compatui.letterboxedu.LetterboxEduWindowManager;

import com.android.wm.shell.sysui.KeyguardChangeListener;

import com.android.wm.shell.sysui.ShellController;

import com.android.wm.shell.sysui.ShellInit;

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import com.android.wm.shell.ShellTaskOrganizer; 
import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.SyncTransactionQueue;

import com.android.wm.shell.compatui.CompatUIController.CompatUICallback;

import com.android.wm.shell.compatui.letterboxedu.LetterboxEduWindowManager;



import java.util.function.Consumer;

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduDialogActionLayout.java→libs/WindowManager/Shell/src/com/android/wm/shell/compatui/LetterboxEduDialogActionLayout.java

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 * Copyright (C) 2023 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.compatui.letterboxedu;

package com.android.wm.shell.compatui;



import android.content.Context;

import android.content.res.TypedArray;

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduDialogLayout.java→libs/WindowManager/Shell/src/com/android/wm/shell/compatui/LetterboxEduDialogLayout.java

+2 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 * Copyright (C) 2023 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.wm.shell.compatui.letterboxedu;

package com.android.wm.shell.compatui;



import android.annotation.Nullable;

import android.content.Context;
@@ -26,7 +26,6 @@ import android.widget.TextView; 
import androidx.constraintlayout.widget.ConstraintLayout;



import com.android.wm.shell.R;

import com.android.wm.shell.compatui.DialogContainerSupplier;



/**

 * Container for Letterbox Education Dialog and background dim.