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

Commit 08b9a301 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 

Change-Id: Iaf157466e6054f24e4faede83849e22a8b004754
parents a0503dca f241f952

packages/SystemUI/res/layout/controls_base_item.xml

+6 −15
Original line number Original line Diff line number Diff line
@@ -40,29 +40,20 @@ 




    <TextView

    <TextView

        android:id="@+id/status"

        android:id="@+id/status"

        android:layout_width="wrap_content"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:textAppearance="@style/TextAppearance.Control.Status"

        android:textAppearance="@style/TextAppearance.Control.Status"

        android:paddingTop="@dimen/control_padding_adjustment"

        android:paddingTop="@dimen/control_padding_adjustment"

        android:paddingStart="@dimen/control_status_padding"

        android:paddingStart="@dimen/control_status_padding"

        android:clickable="false"

        android:clickable="true"

        android:focusable="false"

        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_constraintBottom_toBottomOf="@+id/icon"

        app:layout_constraintStart_toEndOf="@+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

    <TextView

        android:id="@+id/title"

        android:id="@+id/title"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

packages/SystemUI/res/layout/global_actions_grid_v2.xml

+1 −3
Original line number Original line Diff line number Diff line
@@ -67,8 +67,6 @@ 
          android:layout_width="match_parent"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

          android:layout_height="wrap_content"

          android:orientation="vertical"

          android:orientation="vertical"

          android:layout_marginRight="@dimen/global_actions_grid_horizontal_padding"

          android:layout_marginLeft="@dimen/global_actions_grid_horizontal_padding"

      />

      />

    </LinearLayout>

    </LinearLayout>

  </com.android.systemui.globalactions.MinHeightScrollView>

  </com.android.systemui.globalactions.MinHeightScrollView>

packages/SystemUI/res/values-land/config.xml

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




    <!-- orientation of the dead zone when touches have recently occurred elsewhere on screen -->

    <!-- orientation of the dead zone when touches have recently occurred elsewhere on screen -->

    <integer name="navigation_bar_deadzone_orientation">1</integer>

    <integer name="navigation_bar_deadzone_orientation">1</integer>



    <!-- Max number of columns for quick controls area -->

    <integer name="controls_max_columns">4</integer>

</resources>
 
</resources>

packages/SystemUI/res/values-sw320dp/dimens.xml

+2 −0
Original line number Original line 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_side_margin">22dp</dimen>

    <dimen name="global_actions_grid_item_icon_bottom_margin">4dp</dimen>

    <dimen name="global_actions_grid_item_icon_bottom_margin">4dp</dimen>





    <!-- Home Controls -->

    <dimen name="controls_list_side_margin">10dp</dimen>

</resources>

</resources>

packages/SystemUI/res/values-sw360dp/dimens.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -26,5 +26,7 @@ 
         navigation_extra_key_width -->

         navigation_extra_key_width -->

    <dimen name="navigation_side_padding">40dip</dimen>

    <dimen name="navigation_side_padding">40dip</dimen>





    <!-- Home Controls -->

    <dimen name="controls_list_side_margin">12dp</dimen>

</resources>

</resources>