Commit 15d3598c authored by Christian Dullweber's avatar Christian Dullweber Committed by Commit Bot

Add https image compression message to new PageInfo UI

Copy message about https image compression from old UI to the new UI.
We need to improve the design later on.

Screenshot: https://crbug.com/1077766#c64
Bug: 1077766, 1101489
Change-Id: I8f68ab51388b1604372dea3815d4d999393d75fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440619
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: default avatarEhimare Okoyomon <eokoyomon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812360}
parent b5923366
...@@ -10,17 +10,15 @@ ...@@ -10,17 +10,15 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingBottom="8dp" android:background="@color/sheet_bg_color"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/sheet_bg_color"> android:divider="@android:color/transparent"
android:showDividers="middle"
android:dividerHeight="12dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<View <View
android:id="@+id/page_info_preview_separator" android:id="@+id/page_info_preview_separator"
android:layout_marginTop="16dp" android:layout_marginTop="4dp"
style="@style/HorizontalDivider" style="@style/HorizontalDivider"
android:visibility="gone" /> android:visibility="gone" />
...@@ -28,7 +26,8 @@ ...@@ -28,7 +26,8 @@
android:id="@+id/page_info_preview_message" android:id="@+id/page_info_preview_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="14dp" android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:paddingTop="2dp"
android:textAppearance="@style/TextAppearance.TextLarge.Primary" android:textAppearance="@style/TextAppearance.TextLarge.Primary"
android:text="@string/page_info_preview_message" android:text="@string/page_info_preview_message"
android:visibility="gone" /> android:visibility="gone" />
...@@ -37,14 +36,21 @@ ...@@ -37,14 +36,21 @@
android:id="@+id/page_info_preview_load_original" android:id="@+id/page_info_preview_load_original"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="12dp" android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:textAppearance="@style/TextAppearance.TextLarge.Primary" android:textAppearance="@style/TextAppearance.TextLarge.Primary"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout>
<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"
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
...@@ -73,10 +79,7 @@ ...@@ -73,10 +79,7 @@
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_marginEnd="@dimen/page_info_popup_padding_sides" android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:layout_marginStart="@dimen/page_info_popup_padding_sides"
android:layout_marginTop="12dp"
android:layout_marginBottom="4dp"
android:paddingEnd="@dimen/page_info_popup_button_padding_sides" android:paddingEnd="@dimen/page_info_popup_button_padding_sides"
android:paddingStart="@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"
...@@ -88,9 +91,7 @@ ...@@ -88,9 +91,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginEnd="@dimen/page_info_popup_padding_sides" android:layout_marginHorizontal="@dimen/page_info_popup_padding_sides"
android:layout_marginStart="@dimen/page_info_popup_padding_sides"
android:layout_marginTop="2dp"
android:paddingEnd="@dimen/page_info_popup_button_padding_sides" android:paddingEnd="@dimen/page_info_popup_button_padding_sides"
android:paddingStart="@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"
......
...@@ -283,7 +283,6 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr ...@@ -283,7 +283,6 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr
this, view2.getCookiesRowView(), mDelegate, mFullUrl); this, view2.getCookiesRowView(), mDelegate, mFullUrl);
} else { } else {
mView.showPerformanceInfo(mDelegate.shouldShowPerformanceBadge(mFullUrl)); mView.showPerformanceInfo(mDelegate.shouldShowPerformanceBadge(mFullUrl));
mView.showHttpsImageCompressionInfo(mDelegate.isHttpsImageCompressionApplied());
CookieControlsView.CookieControlsParams cookieControlsParams = CookieControlsView.CookieControlsParams cookieControlsParams =
new CookieControlsView.CookieControlsParams(); new CookieControlsView.CookieControlsParams();
...@@ -295,6 +294,8 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr ...@@ -295,6 +294,8 @@ public class PageInfoController implements PageInfoMainController, ModalDialogPr
mView.getCookieControlsView().setParams(cookieControlsParams); mView.getCookieControlsView().setParams(cookieControlsParams);
} }
mView.showHttpsImageCompressionInfo(mDelegate.isHttpsImageCompressionApplied());
// TODO(crbug.com/1040091): Remove when cookie controls are launched. // TODO(crbug.com/1040091): Remove when cookie controls are launched.
boolean showTitle = viewParams.cookieControlsShown; boolean showTitle = viewParams.cookieControlsShown;
mPermissionParamsListBuilder = mPermissionParamsListBuilder =
......
...@@ -59,11 +59,6 @@ public class PageInfoViewV2 extends PageInfoView { ...@@ -59,11 +59,6 @@ public class PageInfoViewV2 extends PageInfoView {
mOnUiClosingCallback = params.onUiClosingCallback; mOnUiClosingCallback = params.onUiClosingCallback;
} }
@Override
protected void initHttpsImageCompression(PageInfoViewParams params) {
// TODO(crbug.com/1077766): Migrate image compression UI.
}
@Override @Override
protected void initSiteSettings(PageInfoViewParams params) {} protected void initSiteSettings(PageInfoViewParams params) {}
......
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