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

Commit 9a53a249 authored by Grace Jia's avatar Grace Jia Committed by Android (Google) Code Review
Browse files

Merge "Support RTL for blocking suppressed bar." into main

parents 9f356c57 a2a0cf35

res/xml/activity_blocked_numbers.xml

+4 −4
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
                    android:layout_height="wrap_content"

                    android:text="@string/non_primary_user"

                    android:paddingTop="@dimen/blocked_numbers_large_padding"

                    android:paddingLeft="@dimen/blocked_numbers_large_padding"

                    android:paddingRight="@dimen/blocked_numbers_large_padding"

                    android:paddingStart="@dimen/blocked_numbers_large_padding"

                    android:paddingEnd="@dimen/blocked_numbers_large_padding"

                    style="@style/BlockedNumbersTextPrimary2"

                    android:visibility="gone" />
@@ -62,8 +62,8 @@ 
                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:paddingTop="@dimen/blocked_numbers_large_padding"

                        android:paddingLeft="@dimen/blocked_numbers_large_padding"

                        android:paddingRight="@dimen/blocked_numbers_large_padding">

                        android:paddingStart="@dimen/blocked_numbers_large_padding"

                        android:paddingEnd="@dimen/blocked_numbers_large_padding">



                    <TextView

                            android:layout_width="wrap_content"

res/xml/blocking_suppressed_butterbar.xml

+9 −9
Original line number Diff line number Diff line
@@ -25,19 +25,19 @@ 
            android:id="@+id/icon"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_alignParentLeft="true"

            android:layout_alignParentStart="true"

            android:paddingTop="@dimen/blocked_numbers_large_padding"

            android:paddingRight="@dimen/blocked_numbers_large_padding"

            android:paddingLeft="@dimen/blocked_numbers_large_padding"

            android:paddingEnd="@dimen/blocked_numbers_large_padding"

            android:paddingStart="@dimen/blocked_numbers_large_padding"

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



    <TextView

            android:id="@+id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toRightOf="@id/icon"

            android:layout_toEndOf="@id/icon"

            android:paddingTop="@dimen/blocked_numbers_large_padding"

            android:paddingRight="@dimen/blocked_numbers_large_padding"

            android:paddingEnd="@dimen/blocked_numbers_large_padding"

            android:text="@string/blocked_numbers_butter_bar_title"

            style="@style/BlockedNumbersTextPrimary2" />
@@ -45,11 +45,11 @@ 
            android:id="@+id/description"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toRightOf="@id/icon"

            android:layout_toEndOf="@id/icon"

            android:layout_below="@id/title"

            android:paddingTop="@dimen/blocked_numbers_large_padding"

            android:paddingBottom="@dimen/blocked_numbers_large_padding"

            android:paddingRight="@dimen/blocked_numbers_large_padding"

            android:paddingEnd="@dimen/blocked_numbers_large_padding"

            android:text="@string/blocked_numbers_butter_bar_body"

            style="@style/BlockedNumbersTextSecondary" />
@@ -57,9 +57,9 @@ 
            android:id="@+id/reenable_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toRightOf="@id/icon"

            android:layout_toEndOf="@id/icon"

            android:layout_below="@id/description"

            android:paddingRight="@dimen/blocked_numbers_large_padding"

            android:paddingEnd="@dimen/blocked_numbers_large_padding"

            android:text="@string/blocked_numbers_butter_bar_button"

            style="@style/BlockedNumbersButton"

            android:background="?android:attr/selectableItemBackgroundBorderless" />