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

Commit 38b4352d authored by Merissa Mitchell's avatar Merissa Mitchell Committed by Automerger Merge Worker
Browse files

Merge "Rename caption resources for Desktop mode." into tm-qpr-dev am: 65e129f2 am: e7498c23 

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



Change-Id: Ie75469c4ce49e2c0b5ad2ee388a24c6f5674204d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8efeda0b e7498c23

libs/WindowManager/Shell/res/layout/caption_handle_menu.xml→libs/WindowManager/Shell/res/layout/desktop_mode_decor_handle_menu.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ android:id="@+id/handle_menu" 
android:layout_width="wrap_content"

android:layout_height="wrap_content"

android:gravity="center_horizontal"

android:background="@drawable/decor_caption_menu_background">

android:background="@drawable/desktop_mode_decor_menu_background">

    <Button

        style="@style/CaptionButtonStyle"

        android:id="@+id/fullscreen_button"

libs/WindowManager/Shell/res/layout/caption_window_decoration.xml→libs/WindowManager/Shell/res/layout/desktop_mode_window_decor.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
  -->

<com.android.wm.shell.windowdecor.WindowDecorLinearLayout

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

    android:id="@+id/caption"

    android:id="@+id/desktop_mode_caption"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:background="@drawable/decor_caption_title">

    android:background="@drawable/desktop_mode_decor_title">

    <Button

        style="@style/CaptionButtonStyle"

        android:id="@+id/back_button"