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

Commit 0f7bf306 authored by Matthew DeVore's avatar Matthew DeVore Committed by Android (Google) Code Review
Browse files

Merge "Topology pane in extended displays list" into main

parents b4dbc50d 6f28e1a3

res/drawable/display_topology_background.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 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.

-->



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

    <shape android:shape="rectangle">

        <corners android:radius="?android:attr/dialogCornerRadius" />

        <solid android:color="@color/display_topology_background_color" />

    </shape>

</inset>

res/layout/display_topology_preference.xml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 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.

-->



<FrameLayout

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

    android:importantForAccessibility="no"

    android:layout_height="160dp"

    android:layout_width="match_parent"

    android:paddingHorizontal="@dimen/display_topology_pane_margin"

    android:orientation="horizontal">

    <ImageView

        android:importantForAccessibility="no"

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:src="@drawable/display_topology_background"/>

    <FrameLayout

        android:id="@+id/display_topology_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>

    <TextView

        android:id="@+id/topology_hint"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_gravity="top|center_horizontal"

        android:paddingTop="10dp"

        android:text="@string/external_display_topology_hint"/>

</FrameLayout>

res/values-land/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -30,4 +30,7 @@ 


    <!-- Keyboard -->

    <dimen name="keyboard_picker_margin">106dp</dimen>



    <!-- Connected displays -->

    <dimen name="display_topology_pane_margin">80dp</dimen>

</resources>

res/values-night/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -79,5 +79,8 @@ 


    <!-- Pointer fill color setting outline color-->

    <color name="pointer_fill_outline_color">#FFFFFF</color>



    <!-- Connected displays -->

    <color name="display_topology_background_color">@color/settingslib_color_charcoal</color>

</resources>

res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -221,4 +221,7 @@ 


    <!-- Pointer fill color setting outline color-->

    <color name="pointer_fill_outline_color">#000000</color>



    <!-- Connected displays -->

    <color name="display_topology_background_color">@color/settingslib_color_grey100</color>

</resources>