Skip to content

Commit

Permalink
[IncNTP] Add "Does do", "Doesn't do" and "Learn more" sections.
Browse files Browse the repository at this point in the history 
This CL adds "Incognito does", "Incognito doesn't do" and "Learn more" sections as designed in Revamped Incognito NTP project. Also new strings are added with the CL.

You can see the the UX deck here: go/incognito-ntp

Screenshots:
  phone portrait: https://screenshot.googleplex.com/7xQoKBzFnvUtUaV
  phone landscape: https://screenshot.googleplex.com/9KbPYweaDpfQt8o

  tablet portrait: https://screenshot.googleplex.com/5RzXX2LJW5ureYN
  tablet portrait 2: https://screenshot.googleplex.com/857JtXdKKxRsaaF
  tablet landscape: https://screenshot.googleplex.com/9iVx73kSBkNepvN

Bug: 1231020
Change-Id: I45d4b96f7e1389e64dba7e0501f85304da75cb5e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3067352
Reviewed-by: Sky Malice <skym@chromium.org>
Reviewed-by: Kristi Park <kristipark@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Side YILMAZ <sideyilmaz@chromium.org>
Commit-Queue: Alex Ilasi <alexilasi@google.com>
Cr-Commit-Position: refs/heads/master@{#911680}
  • Loading branch information
Alex Ilasi authored and Chromium LUCI CQ committed Aug 13, 2021
1 parent 311db3a commit e6ae57b
Show file tree
Hide file tree
Showing 14 changed files with 306 additions and 203 deletions.
2 changes: 2 additions & 0 deletions chrome/android/chrome_java_resources.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,9 +493,11 @@ chrome_java_resources = [
"java/res/drawable/ic_auto_awesome.xml",
"java/res/drawable/ic_block_red.xml",
"java/res/drawable/ic_cancel_circle.xml",
"java/res/drawable/ic_check.xml",
"java/res/drawable/ic_checkmark_24dp.xml",
"java/res/drawable/ic_cloud_offline_24dp.xml",
"java/res/drawable/ic_credit_card_black.xml",
"java/res/drawable/ic_cross.xml",
"java/res/drawable/ic_desktop_windows.xml",
"java/res/drawable/ic_done_googblue_36dp.xml",
"java/res/drawable/ic_error.xml",
Expand Down
16 changes: 16 additions & 0 deletions chrome/android/java/res/drawable/ic_check.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2021 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M8.7273,16.2836L4.4318,12.209L3,13.5672L8.7273,19L21,7.3582L19.5682,6L8.7273,16.2836Z"
android:fillColor="@color/hairline_stroke_color_light"
android:fillType="evenOdd"/>
</vector>
16 changes: 16 additions & 0 deletions chrome/android/java/res/drawable/ic_cross.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2021 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M19,6.415L17.585,5L12,10.585L6.415,5L5,6.415L10.585,12L5,17.585L6.415,19L12,13.415L17.585,19L19,17.585L13.415,12L19,6.415Z"
android:fillColor="@color/hairline_stroke_color_light"
android:fillType="evenOdd"/>
</vector>
125 changes: 92 additions & 33 deletions chrome/android/java/res/layout/revamped_incognito_description_layout.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,67 +7,126 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/revamped_new_tab_incognito_container"
android:id="@+id/revamped_incognito_ntp_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:orientation="vertical"
android:paddingStart="@dimen/md_incognito_ntp_padding_left" >

<ImageView
android:id="@+id/revamped_new_tab_incognito_icon"
android:id="@+id/revamped_incognito_ntp_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:ignore="ContentDescription"
android:src="@drawable/incognito_splash"
app:tint="@color/ntp_incognito_icon_color" />

<TextView
android:id="@+id/revamped_new_tab_incognito_title"
android:id="@+id/revamped_incognito_ntp_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/new_tab_otr_title"
android:textAppearance="@style/TextAppearance.Headline.Primary.Light" />

<org.chromium.ui.widget.TextViewWithClickableSpans
android:id="@+id/revamped_new_tab_incognito_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.TextMedium.Secondary.Light"
android:lineSpacingExtra="@dimen/md_incognito_ntp_line_spacing" />

<LinearLayout
android:id="@+id/revamped_new_tab_incognito_bulletpoints_container"
android:id="@+id/revamped_incognito_ntp_description_and_learn_more_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="start"
android:layout_marginBottom="12dp">
android:orientation="vertical">

<org.chromium.ui.widget.TextViewWithLeading
android:id="@+id/revamped_new_tab_incognito_features"
<LinearLayout
android:id="@+id/revamped_incognito_ntp_description_text_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.TextMedium.Secondary.Light"
app:leading="@dimen/text_size_medium_leading" />
android:layout_height="wrap_content">

<RelativeLayout
android:id="@+id/revamped_incognito_ntp_does_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/does_and_doesnt_top_spacing">

<TextView
android:id="@+id/revamped_incognito_ntp_does_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/revamped_incognito_ntp_does_header"
android:textAppearance="@style/TextAppearance.Headline.Primary.Light"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="8dp"/>

<ImageView
android:id="@+id/revamped_incognito_ntp_does_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/revamped_incognito_ntp_does_header"
android:layout_alignBottom="@id/revamped_incognito_ntp_does_header"
android:layout_alignTop="@id/revamped_incognito_ntp_does_header"
android:layout_marginStart="8dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_check"/>

<org.chromium.ui.widget.TextViewWithLeading
android:id="@+id/revamped_incognito_ntp_does_description_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.TextMedium.Secondary.Light"
android:layout_below="@id/revamped_incognito_ntp_does_header"
android:layout_alignParentStart="true"
app:leading="@dimen/text_size_medium_leading"/>

</RelativeLayout>

<org.chromium.ui.widget.TextViewWithLeading
android:id="@+id/revamped_new_tab_incognito_warning"
<RelativeLayout
android:id="@+id/revamped_incognito_ntp_does_not_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<TextView
android:id="@+id/revamped_incognito_ntp_does_not_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/revamped_incognito_ntp_does_not_header"
android:textAppearance="@style/TextAppearance.Headline.Primary.Light"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="8dp"/>

<ImageView
android:id="@+id/revamped_incognito_ntp_does_not_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/revamped_incognito_ntp_does_not_header"
android:layout_alignTop="@id/revamped_incognito_ntp_does_not_header"
android:layout_alignBottom="@id/revamped_incognito_ntp_does_not_header"
android:layout_marginStart="8dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_cross"/>

<org.chromium.ui.widget.TextViewWithLeading
android:id="@+id/revamped_incognito_ntp_does_not_description_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.TextMedium.Secondary.Light"
android:layout_below="@id/revamped_incognito_ntp_does_not_header"
android:layout_alignParentStart="true"
app:leading="@dimen/text_size_medium_leading"/>

</RelativeLayout>

</LinearLayout>

<TextView
android:id="@+id/revamped_incognito_ntp_learn_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.TextMedium.Secondary.Light"
app:leading="@dimen/text_size_medium_leading" />
android:minHeight="@dimen/min_touch_target_size"
android:gravity="start"
android:layout_marginTop="@dimen/learn_more_vertical_spacing"
android:layout_marginBottom="@dimen/learn_more_vertical_spacing"/>

</LinearLayout>

<org.chromium.ui.widget.TextViewWithLeading
android:id="@+id/revamped_learn_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="@dimen/min_touch_target_size"
android:gravity="center_vertical"
android:text="@string/learn_more"
android:textAppearance="@style/TextAppearance.IncognitoNewTabLearnMoreLinkModern"
app:leading="@dimen/text_size_medium_leading" />

</org.chromium.chrome.browser.ntp.RevampedIncognitoDescriptionView>
</org.chromium.chrome.browser.ntp.RevampedIncognitoDescriptionView>
3 changes: 3 additions & 0 deletions chrome/android/java/res/values/values.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,7 @@
<!-- Tablet tab strip -->
<item name="compositor_background_tab_outline_alpha" format="float" type="dimen">0.2</item>
<item name="compositor_background_tab_overlay_alpha" format="float" type="dimen">0</item>

<!-- Revamped Incognito NTP -->
<integer name="descriptions_weight">1</integer>
</resources>
12 changes: 6 additions & 6 deletions chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoDescriptionView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@
import android.widget.CompoundButton;

/**
* This interface includes method that are shared in LegacyIncognitoDescriptionView and
* This interface includes methods that are shared in LegacyIncognitoDescriptionView and
* RevampedIncognitoDescriptionView.
*/
public interface IncognitoDescriptionView {
/**
* Set NTP Header
* @param newTabPageHeader
* Set NTP Header.
* @param newTabPageHeader The new tab page header.
*/
void setNewTabHeader(String newTabPageHeader);
default void setNewTabHeader(String newTabPageHeader) {}

/**
* Set learn more on click listerner.
* Set learn more on click listener.
* @param listener The given listener.
*/
void setLearnMoreOnclickListener(View.OnClickListener listener);
default void setLearnMoreOnclickListener(View.OnClickListener listener) {}

/**
* Adjust the Cookie Controls Card.
Expand Down
Loading

0 comments on commit e6ae57b

Please sign in to comment.