Update icons for device types in brave sync

Add license headerss

Author: deeppandya

android/brave_java_resources.gni

@@ -66,7 +66,6 @@ brave_java_resources = [
   "java/res/drawable-hdpi/search_engine_google.png",
   "java/res/drawable-hdpi/search_engine_qwant.png",
   "java/res/drawable-hdpi/search_engine_startpage.png",
-  "java/res/drawable-hdpi/settings_desktop_mode.png",
   "java/res/drawable-hdpi/share_activity_background.png",
   "java/res/drawable-hdpi/share_icon.png",
   "java/res/drawable-hdpi/shortcut_incognito.png",
@@ -125,7 +124,6 @@ brave_java_resources = [
   "java/res/drawable-mdpi/search_engine_google.png",
   "java/res/drawable-mdpi/search_engine_qwant.png",
   "java/res/drawable-mdpi/search_engine_startpage.png",
-  "java/res/drawable-mdpi/settings_desktop_mode.png",
   "java/res/drawable-mdpi/share_activity_background.png",
   "java/res/drawable-mdpi/share_icon.png",
   "java/res/drawable-mdpi/shortcut_incognito.png",
@@ -205,7 +203,6 @@ brave_java_resources = [
   "java/res/drawable-xhdpi/search_engine_google.png",
   "java/res/drawable-xhdpi/search_engine_qwant.png",
   "java/res/drawable-xhdpi/search_engine_startpage.png",
-  "java/res/drawable-xhdpi/settings_desktop_mode.png",
   "java/res/drawable-xhdpi/share_activity_background.png",
   "java/res/drawable-xhdpi/share_icon.png",
   "java/res/drawable-xhdpi/shortcut_incognito.png",
@@ -263,7 +260,6 @@ brave_java_resources = [
   "java/res/drawable-xxhdpi/search_engine_google.png",
   "java/res/drawable-xxhdpi/search_engine_qwant.png",
   "java/res/drawable-xxhdpi/search_engine_startpage.png",
-  "java/res/drawable-xxhdpi/settings_desktop_mode.png",
   "java/res/drawable-xxhdpi/share_activity_background.png",
   "java/res/drawable-xxhdpi/share_icon.png",
   "java/res/drawable-xxhdpi/shortcut_incognito.png",
@@ -315,7 +311,6 @@ brave_java_resources = [
   "java/res/drawable-xxxhdpi/plus.png",
   "java/res/drawable-xxxhdpi/search_engine_brave.png",
   "java/res/drawable-xxxhdpi/search_engine_startpage.png",
-  "java/res/drawable-xxxhdpi/settings_desktop_mode.png",
   "java/res/drawable-xxxhdpi/share_activity_background.png",
   "java/res/drawable-xxxhdpi/share_icon.png",
   "java/res/drawable-xxxhdpi/shortcut_incognito.png",
@@ -538,6 +533,7 @@ brave_java_resources = [
   "java/res/drawable/ic_menu.xml",
   "java/res/drawable/ic_menu_close.xml",
   "java/res/drawable/ic_metamask.xml",
+  "java/res/drawable/ic_monitor.xml",
   "java/res/drawable/ic_neon_color.xml",
   "java/res/drawable/ic_new_tab_page.xml",
   "java/res/drawable/ic_news.xml",
@@ -593,12 +589,14 @@ brave_java_resources = [
   "java/res/drawable/ic_shield_done_filled.xml",
   "java/res/drawable/ic_shield_done_outlined.xml",
   "java/res/drawable/ic_site_settings.xml",
+  "java/res/drawable/ic_smartphone.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_stats_notification_background.xml",
   "java/res/drawable/ic_suggestions.xml",
   "java/res/drawable/ic_sync.xml",
+  "java/res/drawable/ic_tablet.xml",
   "java/res/drawable/ic_thank_you.xml",
   "java/res/drawable/ic_timer.xml",
   "java/res/drawable/ic_tipping_error.xml",

android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java

@@ -149,6 +149,24 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment
     private AlertDialog mFinalWarningDialog;
     private TabLayout mTabLayout;
 
+    // Below enum is matching the values of GetDeviceTypeString() in brave_device_info.cc
+    public enum DeviceType {
+        UNKNOWN("unknown"),
+        DESKTOP("desktop_or_laptop"),
+        PHONE("phone"),
+        TABLET("tablet");
+
+        final String mType;
+
+        DeviceType(final String type) {
+            mType = type;
+        }
+
+        public String getValue() {
+            return mType;
+        }
+    }
+
     BraveSyncWorker getBraveSyncWorker() {
         return BraveSyncWorker.get();
     }
@@ -282,6 +300,20 @@ public void run() {
                                         if (null != listItemView
                                                 && null != separator
                                                 && null != insertPoint) {
+                                            ImageView imageView =
+                                                    (ImageView)
+                                                            listItemView.findViewById(
+                                                                    R.id.brave_sync_device_image);
+                                            int deviceTypeRes = R.drawable.ic_monitor;
+                                            if (DeviceType.PHONE.getValue().equals(device.mType)) {
+                                                deviceTypeRes = R.drawable.ic_smartphone;
+                                            } else if (DeviceType.TABLET
+                                                    .getValue()
+                                                    .equals(device.mType)) {
+                                                deviceTypeRes = R.drawable.ic_tablet;
+                                            }
+                                            imageView.setImageResource(deviceTypeRes);
+
                                             TextView textView =
                                                     (TextView)
                                                             listItemView.findViewById(

android/java/res/drawable-hdpi/settings_desktop_mode.png

@@ -0,0 +1,14 @@
+<!-- Copyright (c) 2024 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF62757E"
+        android:fillType="evenOdd"
+        android:pathData="M20.33 17.33h-7.5V19h2.53a0.83 0.83 0 1 1 0 1.67H8.7a0.83 0.83 0 1 1 0-1.67h2.47v-1.67h-7.5A1.67 1.67 0 0 1 2 15.67v-10A1.67 1.67 0 0 1 3.67 4h16.66C21.25 4 22 4.75 22 5.67v10c0 0.92-0.75 1.66-1.67 1.66ZM3.67 5.67v10h16.66v-10H3.67Z"/>
+</vector>

android/java/res/drawable-mdpi/settings_desktop_mode.png

@@ -0,0 +1,14 @@
+<!-- Copyright (c) 2024 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF62757E"
+        android:fillType="evenOdd"
+        android:pathData="M8.25 2.3c-0.8 0-1.45 0.65-1.45 1.45v16.5c0 0.8 0.65 1.45 1.45 1.45h7.5c0.8 0 1.45-0.65 1.45-1.45V3.75c0-0.8-0.65-1.45-1.45-1.45H14.3V3a0.8 0.8 0 0 1-0.8 0.8h-3A0.8 0.8 0 0 1 9.7 3V2.3H8.25Zm7.5-1.6h-7.5A3.05 3.05 0 0 0 5.2 3.75v16.5a3.05 3.05 0 0 0 3.05 3.05h7.5a3.05 3.05 0 0 0 3.05-3.05V3.75a3.05 3.05 0 0 0-3.05-3.05ZM10.5 19.45a0.8 0.8 0 1 0 0 1.6h3a0.8 0.8 0 0 0 0-1.6h-3Z"/>
+</vector>

android/java/res/drawable-xhdpi/settings_desktop_mode.png

@@ -0,0 +1,14 @@
+<!-- Copyright (c) 2024 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF62757E"
+        android:fillType="evenOdd"
+        android:pathData="M3.7 4.5a3.05 3.05 0 0 1 3.05-3.05h10.5A3.05 3.05 0 0 1 20.3 4.5v15a3.05 3.05 0 0 1-3.05 3.05H6.75A3.05 3.05 0 0 1 3.7 19.5v-15Zm3.05-1.45C5.95 3.05 5.3 3.7 5.3 4.5v15c0 0.8 0.65 1.45 1.45 1.45h10.5c0.8 0 1.45-0.65 1.45-1.45v-15c0-0.8-0.65-1.45-1.45-1.45H6.75ZM9.7 19.5a0.8 0.8 0 0 1 0.8-0.8h3a0.8 0.8 0 1 1 0 1.6h-3a0.8 0.8 0 0 1-0.8-0.8Z"/>
+</vector>

android/java/res/drawable-xxhdpi/settings_desktop_mode.png

@@ -17,7 +17,6 @@
     <ImageView android:id="@+id/brave_sync_device_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/settings_desktop_mode"
         android:layout_centerVertical="true"
         android:contentDescription="@string/brave_sync_btn_mobile" />