Merge pull request #116 from DevT75/chromium

deletion-fixed-bug

src/chrome/android/BUILD.gn

@@ -3810,14 +3810,6 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java",
     "java/src/org/chromium/chrome/browser/tabmodel/TabModelObserverJniBridge.java",
     "java/src/org/chromium/chrome/browser/usage_stats/UsageStatsBridge.java",
-    "java/src/org/chromium/chrome/browser/wootz_wallet/AssetRatioServiceFactory.java",
-    "java/src/org/chromium/chrome/browser/wootz_wallet/BlockchainRegistryFactory.java",
-    "java/src/org/chromium/chrome/browser/wootz_wallet/WootzWalletProviderDelegateImplHelper.java",
-    "java/src/org/chromium/chrome/browser/wootz_wallet/WootzWalletServiceFactory.java",
-    "java/src/org/chromium/chrome/browser/wootz_wallet/SwapServiceFactory.java",
-    "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/ConnectAccountFragment.java",
-    "java/src/org/chromium/chrome/browser/wootz_wallet/permission/WootzDappPermissionPromptDialog.java",
-    "java/src/org/chromium/chrome/browser/wootz_wallet/util/WalletNativeUtils.java",
     "java/src/org/chromium/chrome/browser/webapps/WebApkDataProvider.java",
     "java/src/org/chromium/chrome/browser/webapps/WebApkHandlerDelegate.java",
     "java/src/org/chromium/chrome/browser/webapps/WebApkInstallService.java",

src/chrome/android/chrome_java_resources.gni

@@ -343,14 +343,8 @@ chrome_java_resources = [
   "java/res/drawable/ic_cloud_upload_24dp.xml",
   "java/res/drawable/ic_carat_down.xml",
   "java/res/drawable/ic_drag_handle_24dp.xml",
-  "java/res/drawable/ic_eth.xml",
-  "java/res/drawable/ic_eth_24.xml",
-  "java/res/drawable/ic_eth_color.xml",
   "java/res/drawable/ic_error.xml",
   "java/res/drawable/ic_features_24dp.xml",
-  "java/res/drawable/ic_features_24dp.xml",
-  "java/res/drawable/ic_fil_asset_icon.xml",
-  "java/res/drawable/ic_filecoin_color.xml",
   "java/res/drawable/ic_find_in_page.xml",
   "java/res/drawable/ic_folder_outline_24dp.xml",
   "java/res/drawable/ic_forward_arrow_black_24dp.xml",
@@ -362,7 +356,6 @@ chrome_java_resources = [
   "java/res/drawable/ic_incognito_cct_24dp.xml",
   "java/res/drawable/ic_incognito_reauth_promo_icon.xml",
   "java/res/drawable/ic_install_webapp.xml",
-  "java/res/drawable/ic_aurora_color.xml",
   "java/res/drawable/ic_minimize.xml",
   "java/res/drawable/ic_minimize.xml",
   "java/res/drawable/ic_matic_color.xml",
@@ -375,9 +368,6 @@ chrome_java_resources = [
   "java/res/drawable/ic_play_circle.xml",
   "java/res/drawable/ic_reading_list_folder_24dp.xml",
   "java/res/drawable/ic_recent_tabs_bulk_20dp.xml",
-  "java/res/drawable/ic_sol_asset_icon.xml",
-  "java/res/drawable/ic_sol_color.xml",
-  "java/res/drawable/ic_solana_eligible_ui_icon.xml",
   "java/res/drawable/ic_select_tabs.xml",
   "java/res/drawable/ic_select_window.xml",
   "java/res/drawable/ic_signout_40dp.xml",

src/chrome/android/chrome_java_sources.gni

@@ -1225,105 +1225,4 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java",
   "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorUSBActivity.java",
   "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/AssetRatioServiceFactory.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/BlockchainRegistryFactory.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/WootzWalletProviderDelegateImplHelper.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/WootzWalletServiceFactory.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/SwapServiceFactory.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/activities/AccountSelectorActivity.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/activities/AddAccountActivity.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/activities/AdvanceTxSettingActivity.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/activities/WootzWalletActivity.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/activities/WootzWalletBaseActivity.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/activities/WootzWalletDAppsActivity.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/activities/NetworkSelectorActivity.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/AccountSelectorRecyclerView.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/ApproveTxFragmentPageAdapter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/AutoGridLayoutManager.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/CreateAccountAdapter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/FragmentNavigationItemAdapter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/NetworkSelectorAdapter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/NetworkSpinnerAdapter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/OnboardingNetworkSelectorGridAdapter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/RecoveryPhraseAdapter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/SignMessagePagerAdapter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/TwoLineItemRecyclerViewAdapter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/adapters/WalletOnboardingPagerAdapter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/controller/DAppsWalletController.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/ApproveTxBottomSheetDialogFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/BaseWalletNextPageFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/CreateAccountBottomSheetFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/SolanaTxDetailsFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/TransactionDetailsSheetFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/TwoLineItemBottomSheetFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/TwoLineItemFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/TxDetailsFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/TxFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/UnlockWalletFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/WalletBottomSheetDialogFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/AddSwitchChainNetworkFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/AddTokenFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/BaseDAppsBottomSheetDialogFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/BaseDAppsFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/ConnectAccountFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/DAppsMessageFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/EncryptionKeyFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/SignMessageErrorFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/SignMessageFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/SignTransactionFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/dapps/SiweMessageFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/BaseOnboardingWalletFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingBackupWalletFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingConfirmationFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingCreatingWalletFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingFingerprintUnlockFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingInitWalletFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingNetworkSelectionFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingRecoveryPhraseFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingRestoreWalletFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingSecurePasswordFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingTermsOfUseFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/fragments/onboarding/OnboardingVerifyRecoveryPhraseFragment.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/listeners/AccountSelectorItemListener.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/listeners/OnNextPage.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/listeners/TransactionConfirmationListener.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/modal/WootzWalletPanel.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/modal/DAppsDialog.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/model/AccountSelectorItemModel.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/model/CryptoAccountTypeInfo.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/model/OnboardingViewModel.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/model/TxNonSwipeableViewPager.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/model/WalletAccountCreationRequest.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/observers/ApprovedTxObserver.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/observers/WootzWalletServiceObserverImpl.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/observers/KeyringServiceObserverImpl.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/observers/TxServiceObserverImpl.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/permission/WootzDappPermissionPromptDialog.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/permission/WootzPermissionAccountsListAdapter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/presenters/Amount.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/presenters/SolanaInstructionPresenter.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/AccountsPermissionsHelper.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/AndroidUtils.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/AssetUtils.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/AssetsPricesHelper.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/AsyncUtils.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/BalanceHelper.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/Blockies.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/ItemOffsetDecoration.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/JavaUtils.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/KeystoreHelper.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/NavigationItem.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/NetworkUtils.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/ParsedTransaction.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/ParsedTransactionFees.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/PendingTxHelper.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/SolanaTransactionsGasHelper.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/TokenUtils.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/TransactionUtils.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/Utils.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/Validations.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/WalletConstants.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/WalletDataFilesInstallerUtil.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/WalletNativeUtils.java",
-  "java/src/org/chromium/chrome/browser/wootz_wallet/util/WalletUtils.java",
 ]

src/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java

@@ -985,8 +985,8 @@ public boolean shouldShowTabSwitcherToolbar() {
     }
 
     private void setTopMargin(int topMargin) {
-        // if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
-        topMargin = 0;
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
+            topMargin = 0;
         mPropertyModel.set(TOP_MARGIN, topMargin);
     }
 

src/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java

@@ -178,8 +178,8 @@ void setContentBackgroundColor(int color) {
         mFadingEdgeEnd.setColorFilter(color, PorterDuff.Mode.SRC_IN);
     }
     void setPrimaryColorAndApplyTint(int color) {
-        // if (!ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
-        if(false)
+        if (!ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
+        // if(false)
             return;
 
         // change the background color of the bottom bar if the top toolbar is below

src/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java

@@ -480,8 +480,8 @@ public void onLayoutCompleted(RecyclerView.State state) {
                                 checkAwaitingLayout();
                             }
                         };
-                // if (actionOnRelatedTabs && ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
-                if(true){
+                if (actionOnRelatedTabs && ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                // if(true){
                     gridLayoutManager =
                         new GridLayoutManagerDockBottom(context, GRID_LAYOUT_SPAN_COUNT_COMPACT);
                     ((GridLayoutManagerDockBottom)gridLayoutManager)
@@ -513,7 +513,7 @@ public void onLayoutCompleted(RecyclerView.State state) {
                             }
                         };
                 mRecyclerView.setLayoutManager(layoutManager);
-                            } else if (mMode == TabListMode.LIST) {
+            } else if (mMode == TabListMode.LIST) {
                 LinearLayoutManager layout =
                     new LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) {
                             @Override

src/chrome/android/java/res/values/styles.xml

@@ -109,14 +109,6 @@ found in the LICENSE file.
         <item name="actionBarTheme">@style/ManageSpaceActionBarTheme</item>
     </style>
 
-    <style name="WootzWalletTextViewSubTitle" parent="Widget.AppCompat.TextView">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">@color/wootz_theme_subtitle_text</item>
-        <item name="android:textColorLink">@color/wootz_link</item>
-        <item name="android:textAppearance">?attr/textAppearanceListItem</item>
-    </style>
-
     <!-- Style for the semi-transparent sign-in & history sync opt-in activity.
     The background is translucent since the parent activity content should be
     visible when the bottom sheet or the non-full-screen history sync opt-in

src/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

@@ -249,10 +249,10 @@ public float getTop() {
                         @Override
                         public void setCurrentTouchEventOffsets(float top) {
                             EventForwarder forwarder = getEventForwarder();
-                            // if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
                                 // no need to adjust the touch offsets, since the content view is never moved
                                 top = 0;
-                            // }
+                            }
                             if (forwarder != null) forwarder.setCurrentTouchEventOffsets(0, top);
                         }
 
@@ -909,8 +909,8 @@ void updateWebContentsSize(Tab tab) {
                 mApplicationBottomInsetSupplier != null
                         ? mApplicationBottomInsetSupplier.get().webContentsHeightInset
                         : 0;
-        // if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
-        if(true){
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+        // if(true){
             keyboardInset = 0;
         }
         int viewportInsets = controlsInsets + keyboardInset;

src/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java

@@ -312,8 +312,8 @@ public SwipeHandler getToolbarSwipeHandler() {
 
     @Override
     public SwipeHandler createToolbarSwipeHandler(boolean supportSwipeDown) {
-        boolean move_top_toolbar = true;
-            // ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled();
+        // boolean move_top_toolbar = true;
+        boolean move_top_toolbar = ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled();
         return new ToolbarSwipeHandler(supportSwipeDown && !move_top_toolbar,
                                        supportSwipeDown && move_top_toolbar);
     }

src/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java

@@ -19,6 +19,7 @@
 import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutHelperManager;
 import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutHelperManager.TabModelStartupInfo;
 import org.chromium.chrome.browser.device.DeviceClassManager;
+import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
 import org.chromium.chrome.browser.hub.HubLayout;
 import org.chromium.chrome.browser.hub.HubLayoutDependencyHolder;
 import org.chromium.chrome.browser.layouts.LayoutType;

src/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java

@@ -443,8 +443,8 @@ protected void updateLayout(long time, long dt) {
                 mLeftToolbarOverlay.setXOffset(leftX * dpToPx);
             }
             mLeftTab.setX(leftX);
-            // if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
-            if(true){
+            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+            // if(true){
                 mLeftTab.setY(0);
             } else {
                 mLeftTab.setY(mBrowserControlsStateProvider.getContentOffset() / dpToPx);
@@ -461,8 +461,8 @@ protected void updateLayout(long time, long dt) {
                 mRightToolbarOverlay.setXOffset(rightX * dpToPx);
             }
             mRightTab.setX(rightX);
-            // if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
-            if(true){
+            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+            // if(true){
                 mRightTab.setY(0);
             } else {
                 mRightTab.setY(mBrowserControlsStateProvider.getContentOffset() / dpToPx);

src/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java

@@ -15,6 +15,7 @@
 import org.chromium.chrome.browser.tab_ui.TabContentManager;
 import org.chromium.ui.modelutil.PropertyKey;
 import org.chromium.ui.modelutil.PropertyModel;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
 
 /** A SceneLayer to render a static tab. */
 @JNINamespace("android")
@@ -46,7 +47,12 @@ public void update(PropertyModel model) {
 
         float x = model.get(LayoutTab.RENDER_X) * LayoutTab.sDpToPx;
         // the page content window never moves, it is fixed at the top
-        float y = 0;
+        float y = model.get(LayoutTab.CONTENT_OFFSET)
+        + model.get(LayoutTab.RENDER_Y) * LayoutTab.sDpToPx;
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+            // the page content window never moves, it is fixed at the top
+            y = 0;
+        }
         // Check isActiveLayout to prevent pushing a TAB_ID for a static layer that may already be
         // invalidated by the next layout.
         StaticTabSceneLayerJni.get()