diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_education_ic_expand_more.xml b/libs/WindowManager/Shell/res/drawable/letterbox_education_ic_expand_more.xml deleted file mode 100644 index ff5740609b84e..0000000000000 --- a/libs/WindowManager/Shell/res/drawable/letterbox_education_ic_expand_more.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libs/WindowManager/Shell/res/drawable/letterbox_education_ic_expand_more_ripple.xml b/libs/WindowManager/Shell/res/drawable/letterbox_education_ic_expand_more_ripple.xml deleted file mode 100644 index 16dea484b644e..0000000000000 --- a/libs/WindowManager/Shell/res/drawable/letterbox_education_ic_expand_more_ripple.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - \ No newline at end of file diff --git a/libs/WindowManager/Shell/res/layout/letterbox_education_toast_layout.xml b/libs/WindowManager/Shell/res/layout/letterbox_education_toast_layout.xml deleted file mode 100644 index a309d4829f0d5..0000000000000 --- a/libs/WindowManager/Shell/res/layout/letterbox_education_toast_layout.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index ab2c9b1466b84..40c7647ecedf0 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -219,18 +219,9 @@ 143dp - - 100dp - 28dp - - 16dp - - - 24dp - 48dp @@ -243,9 +234,6 @@ 444dp - - 398dp - 20dp diff --git a/libs/WindowManager/Shell/res/values/strings.xml b/libs/WindowManager/Shell/res/values/strings.xml index a8a9ed74cd357..16a4b524803ac 100644 --- a/libs/WindowManager/Shell/res/values/strings.xml +++ b/libs/WindowManager/Shell/res/values/strings.xml @@ -174,9 +174,6 @@ Get the most out of %s - - Rotate your device for a full-screen view - Rotate your screen to portrait @@ -192,7 +189,4 @@ Got it - - Expand for more information. - diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduToastLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduToastLayout.java deleted file mode 100644 index e7f592dcb14de..0000000000000 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterboxedu/LetterboxEduToastLayout.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2022 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.wm.shell.compatui.letterboxedu; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; -import android.widget.FrameLayout; -import android.widget.ImageView; - -import com.android.wm.shell.R; - -/** - * Container for the Letterbox Education Toast. - */ -// TODO(b/215316431): Add tests -public class LetterboxEduToastLayout extends FrameLayout { - - public LetterboxEduToastLayout(Context context) { - this(context, null); - } - - public LetterboxEduToastLayout(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public LetterboxEduToastLayout(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs, defStyleAttr, 0); - } - - public LetterboxEduToastLayout(Context context, AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - /** - * Register a callback for the dismiss button. - * @param callback The callback to register - */ - void setExpandOnClickListener(Runnable callback) { - findViewById(R.id.letterbox_education_toast_expand).setOnClickListener( - view -> callback.run()); - } - - /** - * Updates the layout with the given app info. - * @param appName The name of the app - * @param appIcon The icon of the app - */ - void updateAppInfo(String appName, Drawable appIcon) { - ImageView icon = findViewById(R.id.letterbox_education_icon); - icon.setContentDescription(appName); - icon.setImageDrawable(appIcon); - } -}