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

Commit 52f67c7d authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Android (Google) Code Review
Browse files

Merge "Fix MirroringDialog specs" into main

parents 8d4680ec 6d2cde15
Loading
Loading
Loading
Loading
+23 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
     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.
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
    <corners
        android:topLeftRadius="28dp"
        android:topRightRadius="28dp"/>
    <solid android:color="?android:attr/colorBackground" />
</shape>
 No newline at end of file
+4 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@
    android:orientation="vertical"
    android:paddingHorizontal="@dimen/dialog_side_padding"
    android:paddingTop="@dimen/dialog_top_padding"
    android:background="@*android:drawable/bottomsheet_background"
    android:background="@drawable/connected_display_dialog_bg"
    android:paddingBottom="@dimen/dialog_bottom_padding">

    <ImageView
@@ -40,7 +40,7 @@
        android:id="@+id/connected_display_dialog_title"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/screenrecord_title_margin_top"
        android:layout_marginTop="16dp"
        android:gravity="center"
        android:text="@string/connected_display_dialog_start_mirroring"
        android:textAppearance="@style/TextAppearance.Dialog.Title" />
@@ -51,13 +51,14 @@
        android:layout_height="wrap_content"
        android:gravity="center"
        android:visibility="gone"
        android:layout_marginTop="16dp"
        android:text="@string/connected_display_dialog_dual_display_stop_warning"
        android:textAppearance="@style/TextAppearance.Dialog.Body" />

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/screenrecord_buttons_margin_top"
        android:layout_marginTop="16dp"
        android:orientation="horizontal">

        <Button
+1 −1
Original line number Diff line number Diff line
@@ -3265,7 +3265,7 @@
    <!--- Title of the dialog appearing when an external display is connected, asking whether to start mirroring [CHAR LIMIT=NONE]-->
    <string name="connected_display_dialog_start_mirroring">Mirror to external display?</string>
    <!--- Body of the mirroring dialog, shown when dual display is enabled. This signals that enabling mirroring will stop concurrent displays on a foldable device. [CHAR LIMIT=NONE]-->
    <string name="connected_display_dialog_dual_display_stop_warning">Any dual screen activity currently running will be stopped</string>
    <string name="connected_display_dialog_dual_display_stop_warning">Your inner display will be mirrored. Your front display will be turned off.</string>
    <!--- Label of the "enable display" button of the dialog appearing when an external display is connected [CHAR LIMIT=NONE]-->
    <string name="mirror_display">Mirror display</string>
    <!--- Label of the dismiss button of the dialog appearing when an external display is connected [CHAR LIMIT=NONE]-->