Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] update layout properties to support RTL mode" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
6dba362ef1
@@ -104,7 +104,7 @@
|
|||||||
android:layout_height="24dp"
|
android:layout_height="24dp"
|
||||||
android:layout_marginEnd="16dp"
|
android:layout_marginEnd="16dp"
|
||||||
android:indeterminate="true"
|
android:indeterminate="true"
|
||||||
android:layout_gravity="right|center"
|
android:layout_gravity="end|center"
|
||||||
android:indeterminateOnly="true"
|
android:indeterminateOnly="true"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
|
|
||||||
@@ -114,7 +114,7 @@
|
|||||||
android:layout_height="24dp"
|
android:layout_height="24dp"
|
||||||
android:layout_marginEnd="16dp"
|
android:layout_marginEnd="16dp"
|
||||||
android:indeterminate="true"
|
android:indeterminate="true"
|
||||||
android:layout_gravity="right|center"
|
android:layout_gravity="end|center"
|
||||||
android:indeterminateOnly="true"
|
android:indeterminateOnly="true"
|
||||||
android:importantForAccessibility="no"
|
android:importantForAccessibility="no"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
@@ -125,14 +125,14 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="64dp"
|
android:layout_height="64dp"
|
||||||
android:layout_gravity="right|center"
|
android:layout_gravity="end|center"
|
||||||
android:gravity="center_vertical">
|
android:gravity="center_vertical">
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/check_box"
|
android:id="@+id/check_box"
|
||||||
android:layout_width="24dp"
|
android:layout_width="24dp"
|
||||||
android:layout_height="24dp"
|
android:layout_height="24dp"
|
||||||
android:layout_marginEnd="16dp"
|
android:layout_marginEnd="16dp"
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="end"
|
||||||
android:button="@drawable/ic_circle_check_box"
|
android:button="@drawable/ic_circle_check_box"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user