PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix RTL alignment issue in private space education" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-07-11 12:06:48 +00:00
committed by Android (Google) Code Review
parent 034e6db92e 20758d5cfe
commit db223afdd8
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/layout/private_space_education_screen.xml
View File

@@ -53,7 +53,7 @@
android:src="@drawable/counter_1_24dp" /> android:src="@drawable/counter_1_24dp" />
<TextView <TextView
style="@style/PrivateSpaceBulletPointTextFontStyle" style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/lockIcon" android:layout_toEndOf="@+id/lockIcon"
android:text="@string/private_space_separate_account_text"/> android:text="@string/private_space_separate_account_text"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
@@ -64,7 +64,7 @@
android:src="@drawable/counter_2_24dp" /> android:src="@drawable/counter_2_24dp" />
<TextView <TextView
style="@style/PrivateSpaceBulletPointTextFontStyle" style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/bellIcon" android:layout_toEndOf="@+id/bellIcon"
android:text="@string/private_space_protected_lock_text"/> android:text="@string/private_space_protected_lock_text"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
@@ -77,7 +77,7 @@
android:src="@drawable/counter_3_24dp" /> android:src="@drawable/counter_3_24dp" />
<TextView <TextView
style="@style/PrivateSpaceBulletPointTextFontStyle" style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/appsIcon" android:layout_toEndOf="@+id/appsIcon"
android:text="@string/private_space_install_apps_text"/> android:text="@string/private_space_install_apps_text"/>
</RelativeLayout> </RelativeLayout>
<TextView <TextView
@@ -94,7 +94,7 @@
android:src="@drawable/ic_private_space_edu_icon" /> android:src="@drawable/ic_private_space_edu_icon" />
<TextView <TextView
style="@style/PrivateSpaceBulletPointTextFontStyle" style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/eduIcon" android:layout_toEndOf="@+id/eduIcon"
android:text="@string/private_space_apps_stopped_text"/> android:text="@string/private_space_apps_stopped_text"/>
</RelativeLayout> </RelativeLayout>
<Space <Space
@@ -112,13 +112,13 @@
android:id="@+id/info" android:id="@+id/info"
style="@style/PrivateSpaceBulletPointTextFontStyle" style="@style/PrivateSpaceBulletPointTextFontStyle"
android:textSize = "14sp" android:textSize = "14sp"
android:layout_toRightOf="@+id/infoIcon" android:layout_toEndOf="@+id/infoIcon"
android:text="@string/private_space_apps_permission_text"/> android:text="@string/private_space_apps_permission_text"/>
<TextView <TextView
android:id="@+id/learn_more" android:id="@+id/learn_more"
style="@style/PrivateSpaceSetupSubHeaderStyle" style="@style/PrivateSpaceSetupSubHeaderStyle"
android:layout_below="@id/info" android:layout_below="@id/info"
android:layout_alignLeft="@+id/info" android:layout_alignStart="@+id/info"
android:paddingTop="24dp" android:paddingTop="24dp"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:text="@string/private_space_learn_more_text"/> android:text="@string/private_space_learn_more_text"/>

5
res/values/styles.xml
View File

@@ -982,14 +982,15 @@
</style> </style>
<style name="PrivateSpaceBulletPointTextFontStyle" parent="@style/PrivateSpaceSetupTextFontStyle"> <style name="PrivateSpaceBulletPointTextFontStyle" parent="@style/PrivateSpaceSetupTextFontStyle">
<item name="android:paddingLeft">16dp</item> <item name="android:paddingStart">16dp</item>
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
<item name="android:textAlignment">viewStart</item>
</style> </style>
<style name="PrivateSpaceBulletPointIconStyle"> <style name="PrivateSpaceBulletPointIconStyle">
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_alignParentLeft">true</item> <item name="android:layout_alignParentStart">true</item>
<item name="android:layout_alignParentTop">true</item> <item name="android:layout_alignParentTop">true</item>
</style> </style>