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

Commit dc841369 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Controls UI - Marquee + dynamic column count" into rvc-dev am: f241f952 am: 05aa82a9

Change-Id: I12167a982ab4a33d6085cf601f4c2fc6be846c1a
parents 120c0efb 05aa82a9
Loading
Loading
Loading
Loading
+6 −15
Original line number Diff line number Diff line
@@ -40,29 +40,20 @@

    <TextView
        android:id="@+id/status"
        android:layout_width="wrap_content"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:textAppearance="@style/TextAppearance.Control.Status"
        android:paddingTop="@dimen/control_padding_adjustment"
        android:paddingStart="@dimen/control_status_padding"
        android:clickable="false"
        android:clickable="true"
        android:focusable="false"
        android:singleLine="true"
        android:ellipsize="marquee"
        android:marqueeRepeatLimit = "marquee_forever"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintBottom_toBottomOf="@+id/icon"
        app:layout_constraintStart_toEndOf="@+id/icon" />


    <TextView
        android:id="@+id/status_extra"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:textAppearance="@style/TextAppearance.Control.Status"
        android:paddingTop="@dimen/control_padding_adjustment"
        android:paddingStart="@dimen/control_status_padding"
        android:clickable="false"
        android:focusable="false"
        app:layout_constraintBottom_toBottomOf="@+id/icon"
        app:layout_constraintStart_toEndOf="@+id/status" />

    <TextView
        android:id="@+id/title"
        android:layout_width="match_parent"
+1 −3
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
          android:orientation="vertical"
          android:layout_marginRight="@dimen/global_actions_grid_horizontal_padding"
          android:layout_marginLeft="@dimen/global_actions_grid_horizontal_padding"
      />
    </LinearLayout>
  </com.android.systemui.globalactions.MinHeightScrollView>
+3 −0
Original line number Diff line number Diff line
@@ -31,4 +31,7 @@

    <!-- orientation of the dead zone when touches have recently occurred elsewhere on screen -->
    <integer name="navigation_bar_deadzone_orientation">1</integer>

    <!-- Max number of columns for quick controls area -->
    <integer name="controls_max_columns">4</integer>
</resources>
+2 −0
Original line number Diff line number Diff line
@@ -30,5 +30,7 @@
    <dimen name="global_actions_grid_item_icon_side_margin">22dp</dimen>
    <dimen name="global_actions_grid_item_icon_bottom_margin">4dp</dimen>

    <!-- Home Controls -->
    <dimen name="controls_list_side_margin">10dp</dimen>
</resources>
+2 −0
Original line number Diff line number Diff line
@@ -26,5 +26,7 @@
         navigation_extra_key_width -->
    <dimen name="navigation_side_padding">40dip</dimen>

    <!-- Home Controls -->
    <dimen name="controls_list_side_margin">12dp</dimen>
</resources>
Loading