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

Commit 65e129f2 authored by Merissa Mitchell's avatar Merissa Mitchell Committed by Android (Google) Code Review
Browse files

Merge "Rename caption resources for Desktop mode." into tm-qpr-dev

parents 9e82c25c 14ba6c47

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"