wootzapp · devjangid15 · Oct 25, 2024 · Oct 25, 2024 · Oct 26, 2024 · Oct 26, 2024
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 .gclient_previous_sync_commits
 .gcs_entries
 .cipd/
+
 node_modules
 __pycache__/
-*.py[cod]
+*.py[cod]
diff --git a/src/args.gn b/src/args.gn
@@ -1,3 +1,16 @@
 target_os = "android"
 target_cpu = "arm64"
-is_debug = false
+enable_cardboard = false
+enable_proguard_obfuscation = false
+enable_hls_demuxer = false
+enable_nacl = false
+proprietary_codecs = true
+ffmpeg_branding = "Chrome"
+treat_warnings_as_errors=false
+enable_extensions=true
+is_java_debug = true
+is_component_build = true
+android_static_analysis = "off"
+cc_wrapper="env CCACHE_SLOPPINESS=time_macros ccache"
+# Build arguments go here.
+# See "gn args <out_dir> --list" for available build arguments.
diff --git a/src/build/config/android/config.gni b/src/build/config/android/config.gni
@@ -96,7 +96,8 @@ if (is_android || is_chromeos) {
   # ASAN requires O MR1.
   # https://github.com/google/sanitizers/wiki/AddressSanitizerOnAndroid/01f8df1ac1a447a8475cdfcb03e8b13140042dbd#running-with-wrapsh-recommended
   if (is_asan) {
-    min_supported_sdk_version = 27
+    min_supported_sdk_version = 27    # The path to the keystore to use for signing builds.
+
   }
 
   assert(
@@ -223,10 +224,10 @@ if (is_android || is_chromeos) {
     android_default_version_name = "Developer Build"
 
     # Forced Android versionCode
-    android_override_version_code = ""
+    android_override_version_code = "12"
 
     # Forced Android versionName
-    android_override_version_name = ""
+    android_override_version_name = "0.12"
 
     # The path to the keystore to use for signing builds.
     android_keystore_path = default_android_keystore_path

diff --git a/src/cc/base/features.cc b/src/cc/base/features.cc
@@ -35,6 +35,7 @@ BASE_FEATURE(kSynchronizedScrolling,
 #else
              base::FEATURE_ENABLED_BY_DEFAULT);
 #endif
+
 BASE_FEATURE(kRemoveMobileViewportDoubleTap,
              "RemoveMobileViewportDoubleTap",
              base::FEATURE_ENABLED_BY_DEFAULT);

diff --git a/src/cc/base/features.h b/src/cc/base/features.h
@@ -15,6 +15,7 @@ namespace features {
 CC_BASE_EXPORT BASE_DECLARE_FEATURE(kAnimatedImageResume);
 CC_BASE_EXPORT extern bool IsImpulseScrollAnimationEnabled();
 CC_BASE_EXPORT BASE_DECLARE_FEATURE(kSynchronizedScrolling);
+
 // When enabled, the double tap to zoom will be disabled when the viewport
 // meta tag is properly set for mobile using content=width=device-width
 // or content=initial-scale=1.0

diff --git a/src/chrome/android/BUILD.gn b/src/chrome/android/BUILD.gn
@@ -3720,6 +3720,7 @@ generate_jni("chrome_jni_headers") {
     "java/src/org/chromium/chrome/browser/download/service/DownloadBackgroundTask.java",
     "java/src/org/chromium/chrome/browser/download/service/DownloadTaskScheduler.java",
     "java/src/org/chromium/chrome/browser/extensions/Extensions.java",
+    "java/src/org/chromium/chrome/browser/extensions/OpenExtensionsById.java",
     "java/src/org/chromium/chrome/browser/extensions/ExtensionsConfirmationDialog.java",
     # "java/src/org/chromium/chrome/browser/extensions/WootzBridge.java",
     "java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java",

diff --git a/src/chrome/android/chrome_java_resources.gni b/src/chrome/android/chrome_java_resources.gni
@@ -555,6 +555,8 @@ chrome_java_resources = [
   "java/res/layout/autofill_expiration_date_fix_flow.xml",
   "java/res/layout/autofill_local_profile_icon.xml",
   "java/res/layout/autofill_migrate_address_profile_prompt.xml",
+  "java/res/layout/autofill_local_profile_icon.xml",
+  "java/res/layout/autofill_migrate_address_profile_prompt.xml",
   "java/res/layout/autofill_name_fixflow.xml",
   "java/res/layout/autofill_save_address_profile_prompt.xml",
   "java/res/layout/autofill_save_card_base_layout.xml",

diff --git a/src/chrome/android/chrome_java_sources.gni b/src/chrome/android/chrome_java_sources.gni
@@ -629,11 +629,13 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/dragdrop/toolbar/ToolbarDragDropCoordinator.java",
   "java/src/org/chromium/chrome/browser/extensions/ExtensionInfo.java",
   "java/src/org/chromium/chrome/browser/extensions/Extensions.java",
+  "java/src/org/chromium/chrome/browser/extensions/OpenExtensionsById.java",
   "java/src/org/chromium/chrome/browser/extensions/ExtensionsConfirmationDialog.java",
   "java/src/org/chromium/chrome/browser/extensions/WootzBridge.java",
   "java/src/org/chromium/chrome/browser/extensions/BrowsingDataProvider.java",
   "java/src/org/chromium/chrome/browser/extensions/BrowsingDataService.java",
   "java/src/org/chromium/chrome/browser/extensions/BrowsingDataConsentDialog.java",
+  "java/src/org/chromium/chrome/browser/extensions/BrowsingHistoryService.java",
   "java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java",
   "java/src/org/chromium/chrome/browser/externalnav/IntentWithRequestMetadataHandler.java",
   "java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java",

diff --git a/src/chrome/android/chrome_public_apk_tmpl.gni b/src/chrome/android/chrome_public_apk_tmpl.gni
@@ -26,15 +26,15 @@ declare_args() {
   # WebView providers which declare one of a handful of package names. See
   # https://chromium.googlesource.com/chromium/src/+/HEAD/android_webview/docs/build-instructions.md#Changing-package-name
   # for details.
-  chrome_public_manifest_package = "org.chromium.chrome"
+  chrome_public_manifest_package = "com.wootzapp.web"
   if (use_stable_package_name_for_trichrome) {
     chrome_public_manifest_package += ".stable"
   } else if (android_channel != "default") {
     chrome_public_manifest_package += "." + android_channel
   }
 }
 
-chrome_public_test_manifest_package = "org.chromium.chrome.tests"
+chrome_public_test_manifest_package = "com.wootzapp.web.tests"
 
 default_chrome_public_jinja_variables = [
   "channel=$android_channel",

diff --git a/src/chrome/android/features/tab_ui/java/res/values/dimens.xml b/src/chrome/android/features/tab_ui/java/res/values/dimens.xml
@@ -39,7 +39,7 @@ found in the LICENSE file.
     <dimen name="selection_tab_list_toggle_button_lateral_inset">18dp</dimen>
     <dimen name="selection_tab_list_toggle_button_vertical_inset">22dp</dimen>
     <dimen name="tasks_view_items_vertical_spacing">8dp</dimen>
-    
+
     <!-- Dimens for bottom tab strip toolbar - by Sagar -->
     <dimen name="bottom_tab_strip_toolbar_margin">8dp</dimen>
 

diff --git a/...s/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/...s/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/.../tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java b/.../tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
@@ -521,7 +521,6 @@ public void onLayoutCompleted(RecyclerView.State state) {
                                 checkAwaitingLayout();
                             }
                         };
-
                 layout.setStackFromEnd(true);
                 mRecyclerView.setLayoutManager(layout);
             }

diff --git a/...tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java b/...tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherPaneBase.java
@@ -277,25 +277,28 @@ private SyncOneshotSupplier<ShrinkExpandAnimationData> 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;
                     if (initialRect.isEmpty() || finalRect.isEmpty()) {
                         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/AndroidManifest.xml b/src/chrome/android/java/AndroidManifest.xml
@@ -30,7 +30,6 @@ by a child template that "extends" this file.
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-
     <!--
       Enable runtime permissions as uses-permission in tip of tree builds
       only for ease of development on Android L and earlier. For consumer
@@ -909,6 +908,13 @@ by a child template that "extends" this file.
            android:foregroundServiceType="dataSync" android:exported="false">
         </service>
 
+        <!-- Extension foreground service -->
+        <service
+           android:name="org.chromium.chrome.browser.extensions.BrowsingHistoryService"
+           android:foregroundServiceType="dataSync"
+           android:exported="false" >
+        </service>
+
         <!-- Download broadcast manager service -->
         <service android:name="org.chromium.chrome.browser.download.DownloadBroadcastManager"
             android:exported="false">

diff --git a/src/chrome/android/java/res/menu/main_menu.xml b/src/chrome/android/java/res/menu/main_menu.xml
@@ -23,11 +23,6 @@ found in the LICENSE file.
                 android:title="@string/accessibility_menu_bookmark"
                 android:titleCondensed="@string/menu_bookmark"
                 android:icon="@drawable/star_outline_24dp"/>
-
-
-
-
-
               <item android:id="@+id/offline_page_id"
                 android:title="@string/download_page"
                 android:titleCondensed="@string/menu_download"
@@ -42,8 +37,6 @@ found in the LICENSE file.
                 android:icon="@drawable/btn_reload_stop"/>
             </menu>
         </item>
-
-
         <item android:id="@+id/update_menu_id"
             android:title="@string/menu_update"
             android:icon="@drawable/menu_update" />
@@ -64,11 +57,6 @@ found in the LICENSE file.
             android:icon="@drawable/ic_select_window" />
         <item android:id="@+id/divider_line_id"
             android:title="@null" />
-
-        <item android:id="@+id/wootz_wallet_id"
-            android:title="@string/wootz_wallet_title"
-            android:icon="@drawable/ic_open_in_browser" />
-
         <item android:id="@+id/open_history_menu_id"
             android:title="@string/menu_history"
             android:icon="@drawable/ic_history_googblue_24dp" />

diff --git a/src/chrome/android/java/res/values-night/colors.xml b/src/chrome/android/java/res/values-night/colors.xml
@@ -16,6 +16,7 @@ found in the LICENSE file.
     <color name="navigation_bubble_arrow">@android:color/white</color>
 
     <color name="wootz_link">#A0A5EB</color>
+
     <!-- Scrollbar colors -->
     <color name="default_scroll_thumb">@color/white_alpha_20</color>
 

diff --git a/src/chrome/android/java/res/values/colors.xml b/src/chrome/android/java/res/values/colors.xml
@@ -12,7 +12,6 @@ found in the LICENSE file.
     <!-- Other colors -->
     <color name="dark_action_bar_color">@color/google_blue_grey_900</color>
     <color name="dark_status_bar_color">#161E21</color>
-    <!-- <color name="baseline_primary_20">@color/modern_blue_600</color> -->
 
     <!-- App menu colors -->
     <color name="update_menu_item_text_color">@color/default_red</color>
@@ -79,7 +78,7 @@ found in the LICENSE file.
     <color name="wallet_gradient_center_color">#BF14A2</color>
     <color name="wallet_gradient_end_color">#F73A1C</color>
     <color name="wallet_gradient_start_color">#4C54D2</color>
-
+    
     <color name="translucent_activity_background_color">#AA3B3B3B</color>
 
     <color name="text_primary">#F3F5F7</color>

diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/src/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -259,7 +259,6 @@
 import org.chromium.ui.dragdrop.DragAndDropDelegateImpl;
 import org.chromium.ui.widget.Toast;
 import org.chromium.url.GURL;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
@@ -581,7 +580,7 @@ protected void onPreCreate() {
                     minimizeAppAndCloseTabOnBackPress(getActivityTab());
                 });
         Log.d("Wootzapp", "start service");
-        startForegroundService(new Intent(this, WootzAppBackgroundService.class));
+        // startForegroundService(new Intent(this, WootzAppBackgroundService.class));
     }
 
     @Override

diff --git a/src/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/src/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -3341,9 +3341,9 @@ public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
             return true;
         }
 
-        if (id == R.id.wootz_wallet_id) {
-            openWootzWallet(false, false, false);
-        } 
+        // if (id == R.id.wootz_wallet_id) {
+        //     openWootzWallet(false, false, false);
+        // } 
 
         if (id == R.id.open_history_menu_id) {
             // 'currentTab' could only be null when opening history from start surface, which is
-Original file line number
+Diff line change
@@ Expand Up / @@ -521,7 +521,6 @@ public void onLayoutCompleted(RecyclerView.State state) { @@
                                     checkAwaitingLayout();
                                 }
                             };
                     layout.setStackFromEnd(true);
                     mRecyclerView.setLayoutManager(layout);
                 }
@@ Expand Down @@