Skip to content

Commit

Permalink
Reland "Clean up legacy non-ThemeRefactorAndroid code now that the fe…
Browse files Browse the repository at this point in the history 
…ature has launched."

Original change's description:
> Clean up legacy non-ThemeRefactorAndroid code now that the feature has
launched.
>
> Bug: 1251194
> Change-Id: I2756b8f84a9af5c8fc2d032207a75833c195760f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3283625
> Reviewed-by: Theresa  <twellington@chromium.org>
> Reviewed-by: Wenyu Fu <wenyufu@chromium.org>
> Reviewed-by: Yue Zhang <yuezhanggg@chromium.org>
> Commit-Queue: Sky Malice <skym@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#943694}

Bug: 1251194
Change-Id: Ie9cd2e5bdb8a189acdf333549f042046e058bb0c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3299135
Reviewed-by: Wenyu Fu <wenyufu@chromium.org>
Reviewed-by: Yue Zhang <yuezhanggg@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1001769}
  • Loading branch information
Sky Malice authored and Chromium LUCI CQ committed May 10, 2022
1 parent 30f4d05 commit 011e562
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 242 deletions.
26 changes: 0 additions & 26 deletions chrome/android/features/tab_ui/java/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,18 @@

<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Tab Switcher colors. -->
<color name="tab_grid_card_view_tint_color">@color/legacy_bg_color_elev_4</color>
<color name="tab_grid_card_view_tint_color_incognito">@color/default_bg_color_dark_elev_4_baseline</color>

<color name="tab_grid_card_title_text_color">@color/default_text_color_list</color>
<color name="tab_grid_card_title_text_color_incognito">@color/default_text_color_light_list</color>

<color name="tab_group_number_text_color">@color/default_text_color_list</color>
<color name="tab_group_number_text_color_incognito">@color/default_text_color_light</color>

<color name="tab_grid_card_action_button_tint_color">@color/default_icon_color_baseline</color>
<color name="tab_grid_card_action_button_tint_color_incognito">@color/default_icon_color_light</color>

<color name="tab_grid_card_divider_tint_color_incognito">@color/divider_line_bg_color_light</color>

<color name="tab_grid_card_thumbnail_placeholder_color">@color/default_bg_color_secondary</color>
<color name="tab_grid_card_thumbnail_placeholder_color_incognito">@color/default_bg_color_dark_elev_3_baseline</color>

<color name="tab_grid_card_selected_color">@color/default_control_color_active_baseline</color>
<color name="tab_grid_card_selected_color_incognito">@color/default_control_color_active_dark</color>

<!-- Tab Group related colors. -->
<color name="tab_list_mini_card_default_background_color">@color/default_bg_color_secondary</color>
<color name="tab_list_mini_card_default_background_color_incognito">@color/default_bg_color_secondary_dark</color>

<color name="tab_grid_dialog_background_color">@color/legacy_bg_color_elev_1</color>
<color name="tab_grid_dialog_background_color_incognito">@color/default_bg_color_dark_elev_1_baseline</color>

<color name="tab_grid_dialog_ungroup_button_text_color">@color/default_icon_color_accent1_baseline</color>
<color name="tab_grid_dialog_ungroup_button_text_color_incognito">@color/default_icon_color_blue_light</color>
<color name="tab_grid_dialog_ungroup_button_text_color_hovered">@color/default_text_color_light_list</color>

<color name="ungroup_bar_shadow_color">@android:color/black</color>

<color name="favicon_background_color">@color/default_bg_color_secondary</color>
<color name="favicon_background_color_incognito">@color/black_alpha_38</color>

<color name="hovered_tab_grid_card_background_color">@color/default_bg_color_secondary</color>
<color name="hovered_tab_grid_card_background_color_incognito">@color/default_bg_color_secondary_dark</color>

<color name="new_tab_tile_plus_color">@color/default_icon_color_secondary_tint_list</color>
<color name="new_tab_tile_plus_color_incognito">@color/default_icon_color_secondary_light</color>
Expand Down
1 change: 0 additions & 1 deletion chrome/android/features/tab_ui/java/res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
<dimen name="tab_grid_card_thumbnail_corner_radius_top">4dp</dimen>
<dimen name="tab_grid_card_thumbnail_corner_radius_bottom">12dp</dimen>
<dimen name="tab_grid_card_thumbnail_margin">4dp</dimen>
<dimen name="tab_list_card_margin">2dp</dimen>
<dimen name="tab_list_card_action_button_size">48dp</dimen>
<dimen name="tab_list_card_action_button_margin">4dp</dimen>
<dimen name="tab_list_card_title_fading_length">24dp</dimen>
Expand Down
25 changes: 0 additions & 25 deletions chrome/android/features/tab_ui/java/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<item name="colorControlHighlight">@color/filled_button_bg_color</item>
</style>

<integer name="view_visible">0</integer> <!-- This is VISIBLE -->
<integer name="view_gone">2</integer> <!-- This is GONE -->

<!-- Theme overlay for theme refactor 2021 -->
Expand Down Expand Up @@ -65,35 +64,11 @@
<item name="android:fadingEdgeLength">@dimen/tab_grid_card_title_fading_length</item>
</style>

<style name="TabGridDialogUngroupBarDivider.Shadow" parent="">
<item name="android:layout_height">@dimen/toolbar_shadow_height</item>
<item name="android:src">@drawable/modern_toolbar_shadow</item>
<item name="android:tint">@color/ungroup_bar_shadow_color</item>
<item name="android:scaleType">fitXY</item>
<item name="android:scaleY">-1</item>
</style>

<style name="TabGridDialogUngroupBarDivider.Hairline" parent="">
<item name="android:layout_height">wrap_content</item>
<item name="android:src">@drawable/toolbar_hairline</item>
</style>

<style name="ThemeRefactorOverlay.Disabled.TabUi" parent="">
<item name="tabGridDividerVisible">@integer/view_visible</item>
<item name="tabGridHeaderHeight">@dimen/tab_list_card_title_height</item>
<item name="tabGridBackground">@drawable/dialog_bg_tinted</item>
<item name="tabGridMargin">@dimen/tab_list_card_margin</item>

<item name="tabGridFaviconStyle">@style/TabGridCardTopFaviconStyle</item>
<item name="tabGridActionButtonStyle">@style/TabGridCardActionButtonStyle</item>
<item name="tabGridThumbnailStyle">@style/TabGridCardThumbnailStyle</item>
<item name="tabGridTitleStyle">@style/TabGridCardTitleStyle</item>

<item name="tabGridDialogCornerRadius">@dimen/tab_list_card_radius</item>
<item name="tabGridDialogAppBarPadding">0dp</item>
<item name="tabGridDialogUngroupBarDividerStyle">@style/TabGridDialogUngroupBarDivider.Shadow</item>
</style>

<style name="ThemeRefactorOverlay.Enabled.TabUi" parent="">
<item name="tabGridDividerVisible">@integer/view_gone</item>
<item name="tabGridHeaderHeight">@dimen/tab_grid_card_header_height</item>
Expand Down
36 changes: 9 additions & 27 deletions ...java/src/org/chromium/chrome/browser/tasks/tab_management/MultiThumbnailCardProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,6 @@ private void drawThumbnailBitmapOnCanvasWithFrame(Bitmap thumbnail, int index) {
new Rect(0, 0, thumbnail.getWidth(), thumbnail.getHeight()),
mThumbnailRects.get(index), mThumbnailBasePaint);
thumbnail.recycle();

if (!TabUiThemeProvider.themeRefactorEnabled()) {
mCanvas.drawRoundRect(
mThumbnailRects.get(index), mRadius, mRadius, mThumbnailFramePaint);
}
}

private void drawFaviconDrawableOnCanvasWithFrame(Drawable favicon, int index) {
Expand Down Expand Up @@ -274,7 +269,7 @@ private void fetch() {
resource.getDimension(R.dimen.tab_grid_thumbnail_favicon_background_down_shift),
resource.getColor(R.color.modern_grey_800_alpha_38));

initializedThumbnailRects(context, expectedThumbnailAspectRatio);
initializedThumbnailRects(context);

// Initialize Rects for favicons and favicon frame.
final float halfFaviconFrameSize =
Expand Down Expand Up @@ -337,39 +332,26 @@ public void destroy() {
}

/**
* Initialize rects used for thumbnails. Depending on whether thene refacotr is enabled, the
* padding around the thumbnail is different.
* Initialize rects used for thumbnails.
*/
private void initializedThumbnailRects(Context context, float expectedThumbnailAspectRatio) {
boolean themeRefactorEnabled = TabUiThemeProvider.themeRefactorEnabled();

private void initializedThumbnailRects(Context context) {
float thumbnailHorizontalPadding =
TabUiThemeProvider.getTabMiniThumbnailPaddingDimension(context);
float thumbnailVerticalPadding = themeRefactorEnabled
? thumbnailHorizontalPadding
: thumbnailHorizontalPadding / expectedThumbnailAspectRatio;
float multiThumbnailHorizontalPadding =
themeRefactorEnabled ? 0 : thumbnailHorizontalPadding;
float multiThumbnailVerticalPadding = themeRefactorEnabled ? 0 : thumbnailVerticalPadding;
float thumbnailVerticalPadding = thumbnailHorizontalPadding;

float centerX = mThumbnailWidth * 0.5f;
float centerY = mThumbnailHeight * 0.5f;
float halfThumbnailHorizontalPadding = thumbnailHorizontalPadding / 2;
float halfThumbnailVerticalPadding = thumbnailVerticalPadding / 2;

mThumbnailRects.add(new RectF(multiThumbnailHorizontalPadding,
multiThumbnailVerticalPadding, centerX - halfThumbnailHorizontalPadding,
mThumbnailRects.add(new RectF(0, 0, centerX - halfThumbnailHorizontalPadding,
centerY - halfThumbnailVerticalPadding));
mThumbnailRects.add(new RectF(centerX + halfThumbnailHorizontalPadding,
multiThumbnailVerticalPadding, mThumbnailWidth - multiThumbnailHorizontalPadding,
mThumbnailRects.add(new RectF(centerX + halfThumbnailHorizontalPadding, 0, mThumbnailWidth,
centerY - halfThumbnailVerticalPadding));
mThumbnailRects.add(new RectF(multiThumbnailHorizontalPadding,
centerY + halfThumbnailVerticalPadding, centerX - halfThumbnailHorizontalPadding,
mThumbnailHeight - multiThumbnailVerticalPadding));
mThumbnailRects.add(new RectF(0, centerY + halfThumbnailVerticalPadding,
centerX - halfThumbnailHorizontalPadding, mThumbnailHeight));
mThumbnailRects.add(new RectF(centerX + halfThumbnailHorizontalPadding,
centerY + halfThumbnailVerticalPadding,
mThumbnailWidth - multiThumbnailHorizontalPadding,
mThumbnailHeight - multiThumbnailVerticalPadding));
centerY + halfThumbnailVerticalPadding, mThumbnailWidth, mThumbnailHeight));
}

@Override
Expand Down
7 changes: 1 addition & 6 deletions ...ab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridThumbnailView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ boolean isPlaceHolder() {
* @param isSelected Whether the thumbnail is on a selected tab.
*/
void setColorThumbnailPlaceHolder(boolean isIncognito, boolean isSelected) {
if (!TabUiThemeProvider.themeRefactorEnabled()) {
setImageResource(TabUiThemeProvider.getThumbnailPlaceHolderColorResource(isIncognito));
return;
}

ColorDrawable placeHolder =
new ColorDrawable(TabUiThemeProvider.getMiniThumbnailPlaceHolderColor(
getContext(), isIncognito, isSelected));
Expand All @@ -79,4 +74,4 @@ void maybeAdjustThumbnailHeight() {
setMinimumHeight(getWidth());
}
}
}
}
26 changes: 6 additions & 20 deletions ...s/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
import static org.chromium.chrome.browser.tasks.tab_management.TabListModel.CardProperties.CARD_ALPHA;

import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.InsetDrawable;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -19,9 +16,9 @@
import android.widget.ImageView.ScaleType;
import android.widget.TextView;

import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat;
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
Expand Down Expand Up @@ -109,21 +106,10 @@ private static void bindCommonProperties(PropertyModel model, ViewLookupCachingF
tabTitleView.setContentDescription(
view.getResources().getString(R.string.accessibility_tabstrip_tab, title));
} else if (TabProperties.IS_SELECTED == propertyKey) {
if (TabUiThemeProvider.themeRefactorEnabled()) {
updateColor(view, model.get(TabProperties.IS_INCOGNITO),
model.get(TabProperties.IS_SELECTED));
updateThumbnail(view, model);
updateFavicon(view, model);
} else {
int selectedTabBackground =
model.get(TabProperties.SELECTED_TAB_BACKGROUND_DRAWABLE_ID);
Resources res = view.getResources();
Resources.Theme theme = view.getContext().getTheme();
Drawable drawable = new InsetDrawable(
ResourcesCompat.getDrawable(res, selectedTabBackground, theme),
(int) res.getDimension(R.dimen.tab_list_selected_inset));
view.setForeground(model.get(TabProperties.IS_SELECTED) ? drawable : null);
}
updateColor(view, model.get(TabProperties.IS_INCOGNITO),
model.get(TabProperties.IS_SELECTED));
updateThumbnail(view, model);
updateFavicon(view, model);
if (TabUiFeatureUtilities.ENABLE_SEARCH_CHIP.getValue()) {
ChipView pageInfoButton = (ChipView) view.fastFindViewById(R.id.page_info_button);
pageInfoButton.getPrimaryTextView().setTextAlignment(
Expand Down Expand Up @@ -407,7 +393,7 @@ private static void updateColor(
(ChromeImageView) rootView.fastFindViewById(R.id.background_view);

cardView.getBackground().mutate();
int backgroundColor = TabUiThemeProvider.getCardViewBackgroundColor(
final @ColorInt int backgroundColor = TabUiThemeProvider.getCardViewBackgroundColor(
cardView.getContext(), isIncognito, isSelected);
ViewCompat.setBackgroundTintList(cardView, ColorStateList.valueOf(backgroundColor));

Expand Down

0 comments on commit 011e562

Please sign in to comment.