diff --git a/src/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/src/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java index 5b13b84c229..e93a6ebf1f9 100644 --- a/src/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java +++ b/src/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java @@ -411,7 +411,7 @@ private static void setFavicon( private static void updateColor( ViewLookupCachingFrameLayout rootView, boolean isIncognito, boolean isSelected) { View cardView = rootView.fastFindViewById(R.id.card_view); - // TextView titleView = (TextView) rootView.fastFindViewById(R.id.tab_title); + TextView titleView = (TextView) rootView.fastFindViewById(R.id.tab_title); TabThumbnailView thumbnail = (TabThumbnailView) rootView.fastFindViewById(R.id.tab_thumbnail); ChromeImageView backgroundView = @@ -423,8 +423,8 @@ private static void updateColor( cardView.getContext(), isIncognito, isSelected); ViewCompat.setBackgroundTintList(cardView, ColorStateList.valueOf(backgroundColor)); - // titleView.setTextColor( - // TabUiThemeUtils.getTitleTextColor(titleView.getContext(), isIncognito, isSelected)); + titleView.setTextColor( + TabUiThemeUtils.getTitleTextColor(titleView.getContext(), isIncognito, false)); thumbnail.updateThumbnailPlaceholder(isIncognito, isSelected); diff --git a/src/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java b/src/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java index 3dea7cc2593..f55fe260219 100644 --- a/src/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java +++ b/src/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java @@ -277,15 +277,21 @@ private SyncOneshotSupplier requestAnimationData( recyclerViewRect.bottom = rootViewRect.bottom; } + // Setting the rootViewRect as the initialRect (case: isShrik -> true) and + // finalRect (case: isShrink -> false) instead of recyclerViewRect as we are + // migrating from TabSwitcherView to HubLayout. + Rect rootViewRect = new Rect(); + mRootView.getRootView().getGlobalVisibleRect(rootViewRect); + int leftOffset = 0; if (isShrink) { - initialRect = recyclerViewRect; + initialRect = rootViewRect; finalRect = coordinator.getTabThumbnailRect(tabId); - leftOffset = initialRect.left; + finalRect.offset(leftOffset, -hubRect.top); } else { initialRect = coordinator.getTabThumbnailRect(tabId); - finalRect = recyclerViewRect; - leftOffset = finalRect.left; + finalRect = rootViewRect; + initialRect.offset(leftOffset, -hubRect.top); } boolean useFallbackAnimation = false; @@ -293,9 +299,7 @@ private SyncOneshotSupplier requestAnimationData( Log.d(TAG, "Geometry not ready using fallback animation."); useFallbackAnimation = true; } - // Ignore left offset and just ensure the width is correct. See crbug/1502437. - initialRect.offset(-leftOffset, -hubRect.top); - finalRect.offset(-leftOffset, -hubRect.top); + animationDataSupplier.set( new ShrinkExpandAnimationData( initialRect, diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/hub/HubLayout.java b/src/chrome/android/java/src/org/chromium/chrome/browser/hub/HubLayout.java index 0ef40b843f5..ecc9b7b8b6c 100644 --- a/src/chrome/android/java/src/org/chromium/chrome/browser/hub/HubLayout.java +++ b/src/chrome/android/java/src/org/chromium/chrome/browser/hub/HubLayout.java @@ -524,10 +524,11 @@ public void onTabCreated( View paneHost = mHubController.getPaneHostView(); assert paneHost.isLaidOut(); Rect finalRect = new Rect(); - paneHost.getGlobalVisibleRect(finalRect); + mRootView.getRootView().getGlobalVisibleRect(finalRect); + // paneHost.getGlobalVisibleRect(finalRect); // Ignore left offset and just ensure the width is correct. See crbug/1502437. - int leftOffset = finalRect.left; - finalRect.offset(-leftOffset, -containerViewRect.top); + int leftOffset = 0; + finalRect.offset(leftOffset, 0); // TODO(crbug.com/40285429): Supply this from HubController so it can look like the // animation diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/src/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java index 31ebf07ff33..1a038c275ae 100644 --- a/src/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java +++ b/src/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java @@ -17,6 +17,8 @@ import android.view.accessibility.AccessibilityEvent; import android.view.autofill.AutofillValue; +import android.util.Log; + import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -28,7 +30,7 @@ import org.chromium.base.CommandLine; import org.chromium.base.ContextUtils; -import org.chromium.base.Log; +// import org.chromium.base.Log; import org.chromium.base.ObserverList; import org.chromium.base.ObserverList.RewindableIterator; import org.chromium.base.ThreadUtils; @@ -491,14 +493,14 @@ public int getThemeColor() { @Override public int getBackgroundColor() { - if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled()) { - if (mCustomView != null && mCustomViewBackgroundColor != null) { - return mCustomViewBackgroundColor; - } - if (mNativePage != null) { - return mNativePage.getBackgroundColor(); - } - } + // if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled()) { + // if (mCustomView != null && mCustomViewBackgroundColor != null) { + // return mCustomViewBackgroundColor; + // } + // if (mNativePage != null) { + // return mNativePage.getBackgroundColor(); + // } + // } return mWebContentBackgroundColor; } @@ -1474,10 +1476,10 @@ void changeWebContentBackgroundColor(int color) { /** Called to notify when the page had painted something non-empty. */ void notifyDidFirstVisuallyNonEmptyPaint() { - if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() - && mWaitingOnBgColorAfterHidingNativePage) { - onBackgroundColorChanged(); - } + // if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() + // && mWaitingOnBgColorAfterHidingNativePage) { + // onBackgroundColorChanged(); + // } mWaitingOnBgColorAfterHidingNativePage = false; } @@ -1701,9 +1703,9 @@ private void showNativePage(NativePage nativePage) { } pushNativePageStateToNavigationEntry(); - if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled()) { - onBackgroundColorChanged(); - } + // if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled()) { + // onBackgroundColorChanged(); + // } updateThemeColor(TabState.UNSPECIFIED_THEME_COLOR); }); } diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java b/src/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java index 73a38431a58..5cdffc5d64f 100644 --- a/src/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java +++ b/src/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java @@ -6,13 +6,15 @@ import android.app.Activity; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import org.chromium.base.ActivityState; import org.chromium.base.ApplicationStatus; import org.chromium.base.Callback; import org.chromium.base.ContextUtils; -import org.chromium.base.Log; +// import org.chromium.base.Log; import org.chromium.base.ObserverList; import org.chromium.base.ObserverList.RewindableIterator; import org.chromium.base.TerminationStatus; @@ -339,14 +341,14 @@ public void didFirstVisuallyNonEmptyPaint() { @Override public void didChangeThemeColor() { - mTab.updateThemeColor(mTab.getWebContents().getThemeColor()); + // mTab.updateThemeColor(mTab.getWebContents().getThemeColor()); } @Override public void onBackgroundColorChanged() { - if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled()) { - mTab.changeWebContentBackgroundColor(mTab.getWebContents().getBackgroundColor()); - } + // if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled()) { + // mTab.changeWebContentBackgroundColor(mTab.getWebContents().getBackgroundColor()); + // } } @Override diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedNavigationBarColorController.java b/src/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedNavigationBarColorController.java index 6d1dc415fdc..ccac13a8dd1 100644 --- a/src/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedNavigationBarColorController.java +++ b/src/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedNavigationBarColorController.java @@ -12,6 +12,8 @@ import android.view.ViewGroup; import android.view.Window; +import android.util.Log; + import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -135,15 +137,15 @@ class TabbedNavigationBarColorController implements BottomAttachedUiObserver.Obs layoutManagerSupplier, fullscreenManager, edgeToEdgeControllerSupplier, - ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() - ? new BottomAttachedUiObserver( - browserControlsStateProvider, - snackbarManagerSupplier.get(), - contextualSearchManagerSupplier, - bottomSheetController, - omniboxSuggestionsVisualState, - insetObserver) - : null); + // ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() + // ? new BottomAttachedUiObserver( + // browserControlsStateProvider, + // snackbarManagerSupplier.get(), + // contextualSearchManagerSupplier, + // bottomSheetController, + // omniboxSuggestionsVisualState, + // insetObserver) + null); } @VisibleForTesting @@ -289,10 +291,10 @@ public void onStartedHiding(@LayoutType int layoutType) { @Override public void onFinishedShowing(@LayoutType int layoutType) { - if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() - && layoutType == LayoutType.BROWSING) { - updateNavigationBarColor(); - } + // if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() + // && layoutType == LayoutType.BROWSING) { + // updateNavigationBarColor(); + // } } }; mLayoutManager.addObserver(mLayoutStateObserver); @@ -300,7 +302,7 @@ public void onFinishedShowing(@LayoutType int layoutType) { } private void updateActiveTab() { - if (!ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled()) return; + // if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled()) return; @Nullable Tab activeTab = mTabModelSelector.getCurrentTab(); if (activeTab == mActiveTab) return; @@ -331,18 +333,17 @@ private void updateNavigationBarColor(@Nullable Integer bottomInset, boolean for mNavigationBarColor = newNavigationBarColor; mForceShowDivider = forceShowDivider; - if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() && !toEdge) { - animateNavigationBarColor(currentNavigationBarColor, newNavigationBarColor); - } else { + // if (ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() && !toEdge) { + // animateNavigationBarColor(currentNavigationBarColor, newNavigationBarColor); + // } else { mWindow.setNavigationBarColor(mNavigationBarColor); - if (toEdge) return; setNavigationBarDividerColor( getNavigationBarDividerColor(mForceDarkNavigationBarColor, false)); UiUtils.setNavigationBarIconColor( mRootView, !mForceDarkNavigationBarColor && mLightNavigationBar); - } + // } } private void animateNavigationBarColor( @@ -449,17 +450,19 @@ int getNavigationBarDividerColor(boolean forceDarkNavigationBar, boolean forceSh } private boolean useBottomAttachedUiColor() { - return ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() - && mBottomAttachedUiColor != null - && getBottomInset() == 0; + // return ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() + // && mBottomAttachedUiColor != null + // && getBottomInset() == 0; + return false; } private boolean useActiveTabColor() { - return ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() - && mLayoutManager != null - && mLayoutManager.getActiveLayoutType() == LayoutType.BROWSING - && mActiveTab != null - && getBottomInset() == 0; + // return ChromeFeatureList.sNavBarColorMatchesTabBackground.isEnabled() + // && mLayoutManager != null + // && mLayoutManager.getActiveLayoutType() == LayoutType.BROWSING + // && mActiveTab != null + // && getBottomInset() == 0; + return false; } private int getBottomInset() { diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/src/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java index 876882fc33d..fc7cf5c9b5f 100644 --- a/src/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/src/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java @@ -2272,7 +2272,7 @@ public void onTintChanged( * from the Tab. */ public void setShouldUpdateToolbarPrimaryColor(boolean shouldUpdate) { - mShouldUpdateToolbarPrimaryColor = shouldUpdate; + mShouldUpdateToolbarPrimaryColor = true; } /** diff --git a/src/chrome/browser/about_flags.cc b/src/chrome/browser/about_flags.cc index e43591ca329..f025c2e5b67 100644 --- a/src/chrome/browser/about_flags.cc +++ b/src/chrome/browser/about_flags.cc @@ -7080,10 +7080,10 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_ANDROID) - {"enable-nav-bar-matches-tab-android", - flag_descriptions::kNavBarColorMatchesTabBackgroundName, - flag_descriptions::kNavBarColorMatchesTabBackgroundDescription, kOsAndroid, - FEATURE_VALUE_TYPE(chrome::android::kNavBarColorMatchesTabBackground)}, + // {"enable-nav-bar-matches-tab-android", + // flag_descriptions::kNavBarColorMatchesTabBackgroundName, + // flag_descriptions::kNavBarColorMatchesTabBackgroundDescription, kOsAndroid, + // FEATURE_VALUE_TYPE(chrome::android::kNavBarColorMatchesTabBackground)}, {"enable-new-tab-search-engine-url-android", flag_descriptions::kNewTabSearchEngineUrlAndroidName, diff --git a/src/chrome/browser/flag-metadata.json b/src/chrome/browser/flag-metadata.json index 785009812da..5a7ec446900 100644 --- a/src/chrome/browser/flag-metadata.json +++ b/src/chrome/browser/flag-metadata.json @@ -3428,11 +3428,11 @@ "owners": [ "dschuff@chromium.org", "native-client-dev@googlegroups.com" ], "expiry_milestone": 128 }, - { - "name": "enable-nav-bar-matches-tab-android", - "owners": [ "twellington@chromium.org", "lazzzis@chromium.org"], - "expiry_milestone": 130 - }, + // { + // "name": "enable-nav-bar-matches-tab-android", + // "owners": [ "twellington@chromium.org", "lazzzis@chromium.org"], + // "expiry_milestone": 130 + // }, { "name": "enable-network-and-issuer-icons-for-secure-payment-confirmation", "owners": [ "smcgruer@chromium.org", "chrome-payments-team@google.com" ], diff --git a/src/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/src/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java index 6d2d0b86928..b1b46bd96e2 100644 --- a/src/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/src/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java @@ -18,6 +18,8 @@ import java.util.List; import java.util.Map; +import android.util.Log; + /** * A list of feature flags exposed to Java. * @@ -583,7 +585,7 @@ private static MutableFlagWithSafeDefault newMutableFlagWithSafeDefault( public static final CachedFlag sDrawNativeEdgeToEdge = newCachedFlag(DRAW_NATIVE_EDGE_TO_EDGE, false); public static final CachedFlag sDrawWebEdgeToEdge = newCachedFlag(DRAW_WEB_EDGE_TO_EDGE, false); - public static final CachedFlag sDynamicTopChrome = newCachedFlag(DYNAMIC_TOP_CHROME, true); + public static final CachedFlag sDynamicTopChrome = newCachedFlag(DYNAMIC_TOP_CHROME, false); public static final CachedFlag sExperimentsForAgsa = newCachedFlag(EXPERIMENTS_FOR_AGSA, true); public static final CachedFlag sFeedLoadingPlaceholder = newCachedFlag(FEED_LOADING_PLACEHOLDER, false); diff --git a/src/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubManagerImpl.java b/src/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubManagerImpl.java index 74c18143c42..18f9ae2474e 100644 --- a/src/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubManagerImpl.java +++ b/src/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubManagerImpl.java @@ -139,6 +139,7 @@ public void setHubLayoutController(@NonNull HubLayoutController hubLayoutControl @Override public @Nullable View getPaneHostView() { + ensureHubCoordinatorIsInitializedForPane(); assert mHubCoordinator != null : "Access of a Hub pane host view that doesn't exist"; return mHubContainerView.findViewById(R.id.hub_pane_host); } @@ -178,6 +179,11 @@ public boolean onHubLayoutBackPressed() { } } + private void ensureHubCoordinatorIsInitializedForPane() { + if (mHubCoordinator != null) return; + ensureHubCoordinatorIsInitialized(); + } + private void ensureHubCoordinatorIsInitialized() { if (mHubCoordinator != null) return; diff --git a/src/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/src/chrome/browser/ui/android/appmenu/internal/BUILD.gn index f70a7047b78..c9ef5d9d09c 100644 --- a/src/chrome/browser/ui/android/appmenu/internal/BUILD.gn +++ b/src/chrome/browser/ui/android/appmenu/internal/BUILD.gn @@ -25,6 +25,7 @@ android_library("java") { deps = [ ":java_resources", "//base:base_java", + "//base/version_info/android:version_constants_java", "//chrome/android:chrome_java", "//chrome/browser/android/content:java", "//chrome/browser/android/lifecycle:java", @@ -34,11 +35,13 @@ android_library("java") { "//components/browser_ui/styles/android:java", "//components/browser_ui/widget/android:java", "//components/embedder_support/android:content_view_java", + "//components/embedder_support/android:web_contents_delegate_java", "//components/thin_webview:factory_java", "//components/thin_webview:java", "//content/public/android:content_java", "//third_party/android_deps:material_design_java", "//third_party/androidx:androidx_annotation_annotation_java", + "//third_party/androidx:androidx_appcompat_appcompat_java", "//third_party/androidx:androidx_appcompat_appcompat_resources_java", "//third_party/androidx:androidx_coordinatorlayout_coordinatorlayout_java", "//third_party/androidx:androidx_core_core_java", diff --git a/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java index b80d8911610..a2952b31767 100644 --- a/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/src/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java @@ -533,6 +533,7 @@ private void returnToAppMenu() { } } } + /* This function is not used anymore since we are removing the back button from the extension webview private void setupFloatingBackButton() { View view = getView(); @@ -1144,6 +1145,12 @@ void bindModel(PropertyModel model,View view) { } else { iconView.setImageDrawable(null); } + + if (title != null) { + title = title.toString() + .substring(0, 1) + .toUpperCase() + title.toString().substring(1); + } titleView.setText(title); diff --git a/src/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/NightModeUtils.java b/src/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/NightModeUtils.java index 34d38d8f0a1..4e4ffbc6b41 100644 --- a/src/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/NightModeUtils.java +++ b/src/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/NightModeUtils.java @@ -120,7 +120,8 @@ public static Context wrapContextWithNightModeConfig( public static @ThemeType int getThemeSetting() { int userSetting = ChromeSharedPreferences.getInstance().readInt(UI_THEME_SETTING, -1); if (userSetting == -1) { - return isNightModeDefaultToLight() ? ThemeType.LIGHT : ThemeType.SYSTEM_DEFAULT; + // return isNightModeDefaultToLight() ? ThemeType.LIGHT : ThemeType.SYSTEM_DEFAULT; + return ThemeType.LIGHT; } else { return userSetting; } diff --git a/src/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/settings/RadioButtonGroupThemePreference.java b/src/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/settings/RadioButtonGroupThemePreference.java index 45c83398f43..6bacba86a02 100644 --- a/src/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/settings/RadioButtonGroupThemePreference.java +++ b/src/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/settings/RadioButtonGroupThemePreference.java @@ -79,9 +79,8 @@ public void onBindViewHolder(PreferenceViewHolder holder) { mCheckBox.setChecked(mDarkenWebsitesEnabled); assert ThemeType.NUM_ENTRIES == 3; - mButtons.set( - ThemeType.SYSTEM_DEFAULT, - (RadioButtonWithDescription) holder.findViewById(R.id.system_default)); + mButtons.set(ThemeType.SYSTEM_DEFAULT, + (RadioButtonWithDescription) holder.findViewById(R.id.system_default)); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { mButtons.get(ThemeType.SYSTEM_DEFAULT) .setDescriptionText( diff --git a/src/chrome/browser/ui/android/omnibox/java/res/values/dimens.xml b/src/chrome/browser/ui/android/omnibox/java/res/values/dimens.xml index a7e0bd91df9..7baa4e4ea5b 100644 --- a/src/chrome/browser/ui/android/omnibox/java/res/values/dimens.xml +++ b/src/chrome/browser/ui/android/omnibox/java/res/values/dimens.xml @@ -69,7 +69,7 @@ found in the LICENSE file. 8dp 48dp 12dp - 0dp + 8dp 8dp 8dp 0dp diff --git a/src/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionLayout.java b/src/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionLayout.java index b3168744566..b52bdaf31b3 100644 --- a/src/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionLayout.java +++ b/src/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/SuggestionLayout.java @@ -151,7 +151,7 @@ public SuggestionLayout(Context context) { var res = context.getResources(); int endSpace = res.getDimensionPixelSize(R.dimen.omnibox_suggestion_end_padding_modern); - setPaddingRelative(0, 0, endSpace, 0); + setPaddingRelative(0, 0, endSpace, 8); mDecorationIconWidthPx = OmniboxResourceProvider.getSuggestionDecorationIconSizeWidth(context); diff --git a/src/content/public/android/java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java b/src/content/public/android/java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java index b40eaca3fa9..66f08bd82c9 100644 --- a/src/content/public/android/java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java +++ b/src/content/public/android/java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java @@ -320,7 +320,6 @@ public void setContentMainCallbackForTests(Runnable r) { /** Wrap ContentMain.start() for testing. */ @VisibleForTesting int contentMainStart(boolean startMinimalBrowser) { - Log.d("lalala", "content main start"); return ContentMain.start(startMinimalBrowser); } diff --git a/src/scripts/generate_grd.py b/src/scripts/generate_grd.py old mode 100644 new mode 100755