Skip to content

GitLab

T
tangled
Commit 234c5157 authored by Christian Dullweber's avatar Christian Dullweber Committed by Commit Bot
Browse files
Options

Improve PreviewTab and Https layout in new PageInfo UI 

Move text to the bottom and revert to individual margins as the
divider does not work as expected.

Bug: 1077766
Change-Id: I7ade4dfd6d1315581dce1cf6b3670490652ff401
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440511Reviewed-by: default avatarEhimare Okoyomon <eokoyomon@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812642}
parent 6dfd67fb
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 40 deletions
components/page_info/android/java/res/layout/page_info_v2.xml
View file @ 234c5157
...@@ -12,42 +12,7 @@ ...@@ -12,42 +12,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/sheet_bg_color" android:background="@color/sheet_bg_color"
android:orientation="vertical" android:orientation="vertical"
android:divider="@android:color/transparent" android:layout_marginBottom="8dp">
android:showDividers="middle"
android:dividerHeight="12dp">
<View
android:id="@+id/page_info_preview_separator"
android:layout_marginTop="4dp"
style="@style/HorizontalDivider"
android:visibility="gone" />
<TextView
android:id="@+id/page_info_preview_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:paddingTop="2dp"
android:textAppearance="@style/TextAppearance.TextLarge.Primary"
android:text="@string/page_info_preview_message"
android:visibility="gone" />
<TextView
android:id="@+id/page_info_preview_load_original"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:textAppearance="@style/TextAppearance.TextLarge.Primary"
android:visibility="gone" />
<TextView
android:id="@+id/page_info_lite_mode_https_image_compression_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:text="@string/page_info_lite_mode_https_image_compression"
android:textAppearance="@style/TextAppearance.TextMedium.Primary"
android:visibility="gone" />
<LinearLayout <LinearLayout
android:id="@+id/page_info_row_wrapper" android:id="@+id/page_info_row_wrapper"
...@@ -74,14 +39,48 @@ ...@@ -74,14 +39,48 @@
android:layout_width="match_parent"/> android:layout_width="match_parent"/>
</LinearLayout> </LinearLayout>
<View
android:id="@+id/page_info_preview_separator"
android:layout_marginTop="16dp"
style="@style/HorizontalDivider"
android:visibility="gone" />
<TextView
android:id="@+id/page_info_preview_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:layout_marginTop="12dp"
android:textAppearance="@style/TextAppearance.TextLarge.Primary"
android:text="@string/page_info_preview_message"
android:visibility="gone" />
<TextView
android:id="@+id/page_info_preview_load_original"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="12dp"
android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:textAppearance="@style/TextAppearance.TextLarge.Primary"
android:visibility="gone" />
<TextView
android:id="@+id/page_info_lite_mode_https_image_compression_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="12dp"
android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:text="@string/page_info_lite_mode_https_image_compression"
android:textAppearance="@style/TextAppearance.TextMedium.Primary"
android:visibility="gone" />
<org.chromium.ui.widget.ButtonCompat <org.chromium.ui.widget.ButtonCompat
android:id="@+id/page_info_instant_app_button" android:id="@+id/page_info_instant_app_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="start" android:layout_gravity="start"
android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides" android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:paddingEnd="@dimen/page_info_popup_button_padding_sides" android:paddingHorizontal="@dimen/page_info_popup_button_padding_sides"
android:paddingStart="@dimen/page_info_popup_button_padding_sides"
android:text="@string/page_info_instant_app_button" android:text="@string/page_info_instant_app_button"
app:buttonColor="@color/app_banner_install_button_bg" app:buttonColor="@color/app_banner_install_button_bg"
style="@style/FilledButton" /> style="@style/FilledButton" />
...@@ -92,8 +91,7 @@ ...@@ -92,8 +91,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides" android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:paddingEnd="@dimen/page_info_popup_button_padding_sides" android:paddingHorizontal="@dimen/page_info_popup_button_padding_sides"
android:paddingStart="@dimen/page_info_popup_button_padding_sides"
android:text="@string/page_info_open_online_button" android:text="@string/page_info_open_online_button"
style="@style/TextButton" /> style="@style/TextButton" />
</LinearLayout> </LinearLayout>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment