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

Commit 2d4f6ed2 authored by Evan Severson's avatar Evan Severson Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-006c5140b9fb42ccbea1fb7797306405" into tm-mainline-prod 

* changes:
  [automerge] Fix RTL mode for FGS manager 2p: f947ac20
  Fix RTL mode for FGS manager
parents fb6b9075 d26c1343

packages/SystemUI/res/layout/fgs_manager_app_item.xml

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
      android:id="@+id/fgs_manager_app_item_icon"

      android:layout_width="28dp"

      android:layout_height="28dp"

      android:layout_marginRight="12dp" />

      android:layout_marginEnd="12dp" />



  <LinearLayout

      android:layout_width="0dp"
@@ -38,7 +38,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="start"

        style="@style/TextAppearance.Dialog.Body" />

        style="@style/FgsManagerAppLabel" />

    <TextView

        android:id="@+id/fgs_manager_app_item_duration"

        android:layout_width="match_parent"
@@ -52,6 +52,6 @@ 
      android:layout_width="wrap_content"

      android:layout_height="48dp"

      android:text="@string/fgs_manager_app_item_stop_button_label"

      android:layout_marginLeft="12dp"

      android:layout_marginStart="12dp"

      style="?android:attr/buttonBarNeutralButtonStyle" />

</LinearLayout>

packages/SystemUI/res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,10 @@ 
        <item name="android:textDirection">locale</item>

    </style>



    <style name="FgsManagerAppLabel" parent="TextAppearance.Dialog.Body">

        <item name="android:textDirection">locale</item>

    </style>



    <style name="FgsManagerAppDuration">

        <item name="android:fontFamily">?android:attr/textAppearanceSmall</item>

        <item name="android:textDirection">locale</item>