Commit 4be6d244 authored by Cathy Li's avatar Cathy Li Committed by Commit Bot

[Explore sites]: Rename files for experimental explore sites to contain Experimental prefix

Bug: 867488
Change-Id: Id45577a66f505af903e77c6bcc4771eab9e12e9c
Reviewed-on: https://chromium-review.googlesource.com/1161091
Commit-Queue: Cathy Li <chili@chromium.org>
Reviewed-by: default avatarTheresa <twellington@chromium.org>
Reviewed-by: default avatarJustin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581764}
parent 7a4adf03
......@@ -58,8 +58,7 @@
android:gravity="center_vertical"
android:inputType="text"
android:singleLine="true"
android:textSize="@dimen/location_bar_url_text_size"
android:textColorHint="@color/search_box_hint" />
android:textAppearance="@style/TextAppearance.NewTabPageSearchBoxText" />
<org.chromium.chrome.browser.widget.TintedImageView
android:id="@+id/voice_search_button"
android:layout_width="wrap_content"
......@@ -92,7 +91,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inflatedId="@+id/explore_sites"
android:layout="@layout/explore_sites_section" />
android:layout="@layout/experimental_explore_sites_section" />
<!-- Site suggestion tile grid placeholder -->
<ViewStub
......
......@@ -616,10 +616,14 @@
<item name="android:textAppearance">@style/BlueLink2</item>
</style>
<!-- New tab page RecyclerView overscroll color -->
<!-- New Tab Page -->
<style name="NewTabPageRecyclerView">
<item name="android:colorEdgeEffect" tools:targetApi="21">@color/google_grey_300</item>
</style>
<style name="TextAppearance.NewTabPageSearchBoxText">
<item name="android:textSize">@dimen/location_bar_url_text_size</item>
<item name="android:textColorHint">@color/search_box_hint</item>
</style>
<!-- Modern List Item -->
<style name="ListItemContainer">
......@@ -771,7 +775,7 @@
<item name="android:focusable">true</item>
<item name="android:textAppearance">@style/BlueButtonText1</item>
<item name="android:padding">16dp</item>
</style>
</style>
<!-- TODO(https://crbug.com/850138): Confirm with UX whether this should be a one-off text
appearance or a pre-defined text appearance. -->
<style name="TextAppearance.IncognitoNewTabLearnMoreLinkModern">
......@@ -780,7 +784,6 @@
</style>
<!-- Picker Dialog animations -->
<style name="PickerDialogAnimation">
<item name="android:windowEnterAnimation">@anim/design_bottom_sheet_slide_in</item>
<item name="android:windowExitAnimation">@null</item>
......
......@@ -23,7 +23,7 @@ import org.chromium.chrome.browser.widget.RoundedIconGenerator;
* The View representing a single explore sites category.
* Consists of a large image icon over descriptive text.
*/
public class ExploreSitesCategoryTileView extends LinearLayout {
public class ExperimentalExploreSitesCategoryTileView extends LinearLayout {
/** The data represented by this tile. */
private ExploreSitesCategoryTile mCategoryData;
......@@ -37,7 +37,7 @@ public class ExploreSitesCategoryTileView extends LinearLayout {
private int mIconHeightPx;
/** Constructor for inflating from XML. */
public ExploreSitesCategoryTileView(Context context, AttributeSet attrs) {
public ExperimentalExploreSitesCategoryTileView(Context context, AttributeSet attrs) {
super(context, attrs);
mResources = context.getResources();
}
......
......@@ -23,7 +23,7 @@ import java.util.List;
* Describes a portion of UI responsible for rendering a group of categories.
* It abstracts general tasks related to initializing and fetching data for the UI.
*/
public class ExploreSitesSection {
public class ExperimentalExploreSitesSection {
private static final int MAX_TILES = 3;
private Profile mProfile;
......@@ -31,7 +31,7 @@ public class ExploreSitesSection {
private View mExploreSection;
private LinearLayout mCategorySection;
public ExploreSitesSection(
public ExperimentalExploreSitesSection(
View view, Profile profile, SuggestionsNavigationDelegate navigationDelegate) {
mProfile = profile;
mExploreSection = view;
......@@ -72,10 +72,11 @@ public class ExploreSitesSection {
tileCount++;
if (tileCount > MAX_TILES) break;
final ExploreSitesCategoryTileView tileView =
(ExploreSitesCategoryTileView) LayoutInflater.from(mExploreSection.getContext())
.inflate(R.layout.explore_sites_category_tile_view, mCategorySection,
false);
final ExperimentalExploreSitesCategoryTileView tileView =
(ExperimentalExploreSitesCategoryTileView) LayoutInflater
.from(mExploreSection.getContext())
.inflate(R.layout.experimental_explore_sites_category_tile_view,
mCategorySection, false);
tileView.initialize(tile, tileWidth);
mCategorySection.addView(tileView);
......@@ -88,7 +89,7 @@ public class ExploreSitesSection {
}
}
private void onIconRetrieved(ExploreSitesCategoryTileView tileView, Bitmap icon) {
private void onIconRetrieved(ExperimentalExploreSitesCategoryTileView tileView, Bitmap icon) {
tileView.updateIcon(icon);
}
}
......@@ -30,7 +30,7 @@ import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.compositor.layouts.content.InvalidationAwareThumbnailProvider;
import org.chromium.chrome.browser.explore_sites.ExploreSitesSection;
import org.chromium.chrome.browser.explore_sites.ExperimentalExploreSitesSection;
import org.chromium.chrome.browser.locale.LocaleManager;
import org.chromium.chrome.browser.ntp.NewTabPage.OnSearchBoxScrollListener;
import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
......@@ -83,7 +83,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
@Nullable
private View mExploreSectionView; // View is null if explore flag is disabled.
@Nullable
private ExploreSitesSection mExploreSection; // Null when explore sites disabled.
private ExperimentalExploreSitesSection mExploreSection; // Null when explore sites disabled.
private OnSearchBoxScrollListener mSearchBoxScrollListener;
......@@ -225,7 +225,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
mSiteSectionViewHolder.bindDataSource(mTileGroup, tileRenderer);
if (ChromeFeatureList.isEnabled(ChromeFeatureList.EXPLORE_SITES)) {
mExploreSection = new ExploreSitesSection(
mExploreSection = new ExperimentalExploreSitesSection(
mExploreSectionView, profile, mManager.getNavigationDelegate());
}
......
......@@ -534,10 +534,10 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/download/ui/OfflineGroupHeaderView.java",
"java/src/org/chromium/chrome/browser/download/ui/SpaceDisplay.java",
"java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java",
"java/src/org/chromium/chrome/browser/explore_sites/ExperimentalExploreSitesCategoryTileView.java",
"java/src/org/chromium/chrome/browser/explore_sites/ExperimentalExploreSitesSection.java",
"java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesBridge.java",
"java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategoryTile.java",
"java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesCategoryTileView.java",
"java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesSection.java",
"java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java",
"java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java",
"java/src/org/chromium/chrome/browser/externalauth/VerifiedHandler.java",
......
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