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

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

Merge "Show topology pane detached from mirror toggle" into main

parents e69d209b e3dc23f7
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -14,13 +14,19 @@
     limitations under the License.
-->

<!-- TODO(b/396116157): I cannot find the correct src of ImageView to set to
     match the other preference items. I tried
     @drawable/android:selectable_item_background but this is private so will
     not compile. It should match the other items so that theme migration will
     switch to the correct final color. -->
<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/display_topology_pane_holder"
    android:importantForAccessibility="no"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
    android:paddingHorizontal="@dimen/display_topology_pane_margin"
    android:layout_marginVertical="@dimen/display_topology_pane_vertical_margin"
    android:layout_marginHorizontal="@dimen/display_topology_pane_margin"
    android:orientation="horizontal">
    <ImageView
        android:importantForAccessibility="no"
+1 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@

    <!-- Connected displays -->
    <dimen name="display_topology_pane_margin">24dp</dimen>
    <dimen name="display_topology_pane_vertical_margin">24dp</dimen>
    <dimen name="display_block_padding">5dp</dimen>
    <dimen name="display_block_highlight_width">2dp</dimen>
    <dimen name="display_block_corner_radius">10dp</dimen>
+5 −2
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@

package com.android.settings.connecteddevice.display

import android.app.WallpaperManager
import com.android.settings.R
import com.android.settingslib.widget.GroupSectionDividerMixin

import android.app.WallpaperManager
import android.content.Context
import android.graphics.Bitmap
import android.graphics.PointF
@@ -45,7 +46,7 @@ import kotlin.math.abs
 * when there is one or more extended display attached.
 */
class DisplayTopologyPreference(context : Context)
        : Preference(context), ViewTreeObserver.OnGlobalLayoutListener {
        : Preference(context), ViewTreeObserver.OnGlobalLayoutListener, GroupSectionDividerMixin {
    @VisibleForTesting lateinit var mPaneContent : FrameLayout
    @VisibleForTesting lateinit var mPaneHolder : FrameLayout
    @VisibleForTesting lateinit var mTopologyHint : TextView
@@ -82,6 +83,8 @@ class DisplayTopologyPreference(context : Context)

        isPersistent = false

        isCopyingEnabled = false

        injector = Injector(context)
    }