diff options
Diffstat (limited to 'adservices/apk/res/layout/consent_notification_fragment_eu.xml')
-rw-r--r-- | adservices/apk/res/layout/consent_notification_fragment_eu.xml | 59 |
1 files changed, 26 insertions, 33 deletions
diff --git a/adservices/apk/res/layout/consent_notification_fragment_eu.xml b/adservices/apk/res/layout/consent_notification_fragment_eu.xml index d552f9896f..8479d899f4 100644 --- a/adservices/apk/res/layout/consent_notification_fragment_eu.xml +++ b/adservices/apk/res/layout/consent_notification_fragment_eu.xml @@ -23,6 +23,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > <ScrollView + android:id="@+id/notification_fragment_scrollview" android:layout_width="match_parent" android:layout_height="0dp" android:scrollbars="vertical" @@ -50,11 +51,9 @@ android:layout_marginStart="0dp" android:src="@drawable/ic_android_icon" tools:ignore="ContentDescription" /> - <TextView android:text="@string/notificationUI_header_title_eu" style="@style/MainStyle.H1" /> - </LinearLayout> <LinearLayout @@ -64,7 +63,8 @@ android:layout_marginTop="16dp" android:padding="24dp" android:background="@drawable/ic_rounded_background" - android:orientation="vertical"> + android:orientation="vertical" + android:animateLayoutChanges="true"> <TextView android:layout_width="match_parent" android:layout_height="wrap_content" @@ -79,28 +79,7 @@ android:layout_marginTop="12dp" android:text="@string/notificationUI_container1_body_text_eu" style="@style/MainStyle.Body1" /> - </LinearLayout> - <LinearLayout - android:id="@+id/container2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:padding="24dp" - android:background="@drawable/ic_rounded_background" - android:orientation="vertical"> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/notificationUI_container2_title_eu" - style="@style/MainStyle.H4" - android:gravity="center_vertical" - android:drawableStart="@drawable/ic_notification_icon_2" - android:drawablePadding="24dp"/> - <TextView - android:layout_marginTop="12dp" - android:text="@string/notificationUI_container2_body_text_eu" - style="@style/MainStyle.Body1" /> <View android:layout_width="match_parent" android:layout_height="1dp" @@ -114,7 +93,6 @@ android:layout_marginTop="0dp" android:text="@string/notificationUI_container1_control_text_eu" style="@style/MainStyle.Body1" /> - <LinearLayout android:id="@+id/how_it_works_expanded_text" android:layout_width="match_parent" @@ -142,6 +120,27 @@ </LinearLayout> </LinearLayout> + <LinearLayout + android:id="@+id/container2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:padding="24dp" + android:background="@drawable/ic_rounded_background" + android:orientation="vertical"> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/notificationUI_container2_title_eu" + style="@style/MainStyle.H4" + android:gravity="center_vertical" + android:drawableStart="@drawable/ic_notification_icon_2" + android:drawablePadding="24dp"/> + <TextView + android:layout_marginTop="12dp" + android:text="@string/notificationUI_container2_body_text_eu" + style="@style/MainStyle.Body1" /> + </LinearLayout> </LinearLayout> </ScrollView> @@ -162,20 +161,14 @@ app:layout_constraintTop_toTopOf="parent" /> <Button android:id="@+id/leftControlButton" - style="@style/MainStyle.NotificationPrimaryButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + style="@style/MainStyle.PrimaryButton" android:text="@string/notificationUI_left_control_button_text_eu" - android:textAllCaps="false" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <Button android:id="@+id/rightControlButton" - style="@style/MainStyle.NotificationPrimaryButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + style="@style/MainStyle.PrimaryButton" android:text="@string/notificationUI_right_control_button_text_eu" - android:textAllCaps="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> |