diff --git a/android/BUILD.gn b/android/BUILD.gn index 3cdb74bd083..c86d2097bfb 100644 --- a/android/BUILD.gn +++ b/android/BUILD.gn @@ -109,9 +109,6 @@ android_resources("java_resources") { "java/brave-res/drawable-hdpi/check.png", "java/brave-res/drawable-hdpi/copy_paste.png", "java/brave-res/drawable-hdpi/ic_ad_free_videos.png", - "java/brave-res/drawable-hdpi/ic_brave_onboarding.png", - "java/brave-res/drawable-hdpi/ic_onboarding_bottom_leaf.png", - "java/brave-res/drawable-hdpi/ic_onboarding_top_leaf.png", "java/brave-res/drawable-hdpi/share_activity_background.png", "java/brave-res/drawable-mdpi/brave_ads_launch_graphic.png", "java/brave-res/drawable-mdpi/brave_sync_btn_laptop.png", @@ -125,9 +122,6 @@ android_resources("java_resources") { "java/brave-res/drawable-mdpi/check.png", "java/brave-res/drawable-mdpi/copy_paste.png", "java/brave-res/drawable-mdpi/ic_ad_free_videos.png", - "java/brave-res/drawable-mdpi/ic_brave_onboarding.png", - "java/brave-res/drawable-mdpi/ic_onboarding_bottom_leaf.png", - "java/brave-res/drawable-mdpi/ic_onboarding_top_leaf.png", "java/brave-res/drawable-mdpi/share_activity_background.png", "java/brave-res/drawable-night-nodpi/ic_quick_action_search_and_bookmark_widget_preview.png", "java/brave-res/drawable-night-nodpi/widget_preview.png", @@ -160,9 +154,6 @@ android_resources("java_resources") { "java/brave-res/drawable-xhdpi/check.png", "java/brave-res/drawable-xhdpi/copy_paste.png", "java/brave-res/drawable-xhdpi/ic_ad_free_videos.png", - "java/brave-res/drawable-xhdpi/ic_brave_onboarding.png", - "java/brave-res/drawable-xhdpi/ic_onboarding_bottom_leaf.png", - "java/brave-res/drawable-xhdpi/ic_onboarding_top_leaf.png", "java/brave-res/drawable-xhdpi/share_activity_background.png", "java/brave-res/drawable-xxhdpi/brave_ads_launch_graphic.png", "java/brave-res/drawable-xxhdpi/brave_sync_btn_laptop.png", @@ -176,9 +167,6 @@ android_resources("java_resources") { "java/brave-res/drawable-xxhdpi/check.png", "java/brave-res/drawable-xxhdpi/copy_paste.png", "java/brave-res/drawable-xxhdpi/ic_ad_free_videos.png", - "java/brave-res/drawable-xxhdpi/ic_brave_onboarding.png", - "java/brave-res/drawable-xxhdpi/ic_onboarding_bottom_leaf.png", - "java/brave-res/drawable-xxhdpi/ic_onboarding_top_leaf.png", "java/brave-res/drawable-xxhdpi/share_activity_background.png", "java/brave-res/drawable-xxxhdpi/brave_ads_launch_graphic.png", "java/brave-res/drawable-xxxhdpi/brave_sync_btn_laptop.png", @@ -192,9 +180,6 @@ android_resources("java_resources") { "java/brave-res/drawable-xxxhdpi/check.png", "java/brave-res/drawable-xxxhdpi/copy_paste.png", "java/brave-res/drawable-xxxhdpi/ic_ad_free_videos.png", - "java/brave-res/drawable-xxxhdpi/ic_brave_onboarding.png", - "java/brave-res/drawable-xxxhdpi/ic_onboarding_bottom_leaf.png", - "java/brave-res/drawable-xxxhdpi/ic_onboarding_top_leaf.png", "java/brave-res/drawable-xxxhdpi/share_activity_background.png", "java/brave-res/drawable/ad_free_card_bg.xml", "java/brave-res/drawable/add_custom_filter_button_background_disabled.xml", @@ -376,12 +361,7 @@ android_resources("java_resources") { "java/brave-res/drawable/ic_neon_color.xml", "java/brave-res/drawable/ic_news_settings.xml", "java/brave-res/drawable/ic_notification_icon.xml", - "java/brave-res/drawable/ic_onboarding_arrow_down.xml", - "java/brave-res/drawable/ic_onboarding_bg.xml", "java/brave-res/drawable/ic_op_color.xml", - "java/brave-res/drawable/ic_p3a_checkbox.xml", - "java/brave-res/drawable/ic_p3a_checkbox_filled.xml", - "java/brave-res/drawable/ic_p3a_checkbox_outline.xml", "java/brave-res/drawable/ic_pause_filled.xml", "java/brave-res/drawable/ic_phantom.xml", "java/brave-res/drawable/ic_phone.xml", @@ -475,7 +455,6 @@ android_resources("java_resources") { "java/brave-res/drawable/rounded_dot_success_status.xml", "java/brave-res/drawable/rounded_filled.xml", "java/brave-res/drawable/rounded_holo_button.xml", - "java/brave-res/drawable/rounded_onboarding_welcome_bg.xml", "java/brave-res/drawable/rounded_set_default_top_corners.xml", "java/brave-res/drawable/rounded_shape.xml", "java/brave-res/drawable/rounded_surface_container_background.xml", @@ -528,7 +507,6 @@ android_resources("java_resources") { "java/brave-res/layout/activity_vpn_server.xml", "java/brave-res/layout/activity_vpn_server_selection.xml", "java/brave-res/layout/activity_welcome_onboarding.xml", - "java/brave-res/layout/activity_welcome_onboarding_default.xml", "java/brave-res/layout/application_item_layout.xml", "java/brave-res/layout/approve_tx_bottom_sheet.xml", "java/brave-res/layout/auto_reconnect_vpn_tutorial_item_layout.xml", diff --git a/android/java/brave-res/drawable-hdpi/ic_brave_onboarding.png b/android/java/brave-res/drawable-hdpi/ic_brave_onboarding.png deleted file mode 100644 index d6a1311ce6b..00000000000 Binary files a/android/java/brave-res/drawable-hdpi/ic_brave_onboarding.png and /dev/null differ diff --git a/android/java/brave-res/drawable-hdpi/ic_onboarding_bottom_leaf.png b/android/java/brave-res/drawable-hdpi/ic_onboarding_bottom_leaf.png deleted file mode 100644 index 94b5cc0d159..00000000000 Binary files a/android/java/brave-res/drawable-hdpi/ic_onboarding_bottom_leaf.png and /dev/null differ diff --git a/android/java/brave-res/drawable-hdpi/ic_onboarding_top_leaf.png b/android/java/brave-res/drawable-hdpi/ic_onboarding_top_leaf.png deleted file mode 100644 index a345285d8fa..00000000000 Binary files a/android/java/brave-res/drawable-hdpi/ic_onboarding_top_leaf.png and /dev/null differ diff --git a/android/java/brave-res/drawable-mdpi/ic_brave_onboarding.png b/android/java/brave-res/drawable-mdpi/ic_brave_onboarding.png deleted file mode 100644 index 94753315d84..00000000000 Binary files a/android/java/brave-res/drawable-mdpi/ic_brave_onboarding.png and /dev/null differ diff --git a/android/java/brave-res/drawable-mdpi/ic_onboarding_bottom_leaf.png b/android/java/brave-res/drawable-mdpi/ic_onboarding_bottom_leaf.png deleted file mode 100644 index e4e0f303811..00000000000 Binary files a/android/java/brave-res/drawable-mdpi/ic_onboarding_bottom_leaf.png and /dev/null differ diff --git a/android/java/brave-res/drawable-mdpi/ic_onboarding_top_leaf.png b/android/java/brave-res/drawable-mdpi/ic_onboarding_top_leaf.png deleted file mode 100644 index c10f7a9bb12..00000000000 Binary files a/android/java/brave-res/drawable-mdpi/ic_onboarding_top_leaf.png and /dev/null differ diff --git a/android/java/brave-res/drawable-xhdpi/ic_brave_onboarding.png b/android/java/brave-res/drawable-xhdpi/ic_brave_onboarding.png deleted file mode 100644 index a19870466a2..00000000000 Binary files a/android/java/brave-res/drawable-xhdpi/ic_brave_onboarding.png and /dev/null differ diff --git a/android/java/brave-res/drawable-xhdpi/ic_onboarding_bottom_leaf.png b/android/java/brave-res/drawable-xhdpi/ic_onboarding_bottom_leaf.png deleted file mode 100644 index 0b78f8194d3..00000000000 Binary files a/android/java/brave-res/drawable-xhdpi/ic_onboarding_bottom_leaf.png and /dev/null differ diff --git a/android/java/brave-res/drawable-xhdpi/ic_onboarding_top_leaf.png b/android/java/brave-res/drawable-xhdpi/ic_onboarding_top_leaf.png deleted file mode 100644 index caa814b6d8c..00000000000 Binary files a/android/java/brave-res/drawable-xhdpi/ic_onboarding_top_leaf.png and /dev/null differ diff --git a/android/java/brave-res/drawable-xxhdpi/ic_brave_onboarding.png b/android/java/brave-res/drawable-xxhdpi/ic_brave_onboarding.png deleted file mode 100644 index 16de7f77bbc..00000000000 Binary files a/android/java/brave-res/drawable-xxhdpi/ic_brave_onboarding.png and /dev/null differ diff --git a/android/java/brave-res/drawable-xxhdpi/ic_onboarding_bottom_leaf.png b/android/java/brave-res/drawable-xxhdpi/ic_onboarding_bottom_leaf.png deleted file mode 100644 index 43f2a7271b8..00000000000 Binary files a/android/java/brave-res/drawable-xxhdpi/ic_onboarding_bottom_leaf.png and /dev/null differ diff --git a/android/java/brave-res/drawable-xxhdpi/ic_onboarding_top_leaf.png b/android/java/brave-res/drawable-xxhdpi/ic_onboarding_top_leaf.png deleted file mode 100644 index 1d1d7c69635..00000000000 Binary files a/android/java/brave-res/drawable-xxhdpi/ic_onboarding_top_leaf.png and /dev/null differ diff --git a/android/java/brave-res/drawable-xxxhdpi/ic_brave_onboarding.png b/android/java/brave-res/drawable-xxxhdpi/ic_brave_onboarding.png deleted file mode 100644 index 5637ac9d604..00000000000 Binary files a/android/java/brave-res/drawable-xxxhdpi/ic_brave_onboarding.png and /dev/null differ diff --git a/android/java/brave-res/drawable-xxxhdpi/ic_onboarding_bottom_leaf.png b/android/java/brave-res/drawable-xxxhdpi/ic_onboarding_bottom_leaf.png deleted file mode 100644 index 48469b0cddc..00000000000 Binary files a/android/java/brave-res/drawable-xxxhdpi/ic_onboarding_bottom_leaf.png and /dev/null differ diff --git a/android/java/brave-res/drawable-xxxhdpi/ic_onboarding_top_leaf.png b/android/java/brave-res/drawable-xxxhdpi/ic_onboarding_top_leaf.png deleted file mode 100644 index dece1015e41..00000000000 Binary files a/android/java/brave-res/drawable-xxxhdpi/ic_onboarding_top_leaf.png and /dev/null differ diff --git a/android/java/brave-res/drawable/ic_onboarding_arrow_down.xml b/android/java/brave-res/drawable/ic_onboarding_arrow_down.xml deleted file mode 100644 index c4f98d26692..00000000000 --- a/android/java/brave-res/drawable/ic_onboarding_arrow_down.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/android/java/brave-res/drawable/ic_onboarding_bg.xml b/android/java/brave-res/drawable/ic_onboarding_bg.xml deleted file mode 100644 index 6e6d0d17191..00000000000 --- a/android/java/brave-res/drawable/ic_onboarding_bg.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - diff --git a/android/java/brave-res/drawable/ic_p3a_checkbox.xml b/android/java/brave-res/drawable/ic_p3a_checkbox.xml deleted file mode 100644 index f08e428dfc1..00000000000 --- a/android/java/brave-res/drawable/ic_p3a_checkbox.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/android/java/brave-res/drawable/ic_p3a_checkbox_filled.xml b/android/java/brave-res/drawable/ic_p3a_checkbox_filled.xml deleted file mode 100644 index fd179a14bba..00000000000 --- a/android/java/brave-res/drawable/ic_p3a_checkbox_filled.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/android/java/brave-res/drawable/ic_p3a_checkbox_outline.xml b/android/java/brave-res/drawable/ic_p3a_checkbox_outline.xml deleted file mode 100644 index 4d1afd419d3..00000000000 --- a/android/java/brave-res/drawable/ic_p3a_checkbox_outline.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/android/java/brave-res/drawable/rounded_onboarding_welcome_bg.xml b/android/java/brave-res/drawable/rounded_onboarding_welcome_bg.xml deleted file mode 100644 index 1dd4996b177..00000000000 --- a/android/java/brave-res/drawable/rounded_onboarding_welcome_bg.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/android/java/brave-res/layout-sw600dp/activity_welcome_onboarding.xml b/android/java/brave-res/layout-sw600dp/activity_welcome_onboarding.xml index c1c5a88eaff..d8a032fea62 100644 --- a/android/java/brave-res/layout-sw600dp/activity_welcome_onboarding.xml +++ b/android/java/brave-res/layout-sw600dp/activity_welcome_onboarding.xml @@ -4,54 +4,49 @@ 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/. --> - + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/onboarding_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/onboarding_background"> - - - - - - - + + android:layout_gravity="center" + android:src="@drawable/ic_brave_splash_animated" + android:contentDescription="@string/brave_onboarding_splash_logo_description" + android:alpha="0" /> + - - + - - + + diff --git a/android/java/brave-res/layout/activity_welcome_onboarding.xml b/android/java/brave-res/layout/activity_welcome_onboarding.xml index e6d87f250eb..3d0d0c13f3a 100644 --- a/android/java/brave-res/layout/activity_welcome_onboarding.xml +++ b/android/java/brave-res/layout/activity_welcome_onboarding.xml @@ -4,47 +4,42 @@ 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/. --> - + - + - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent"/> + - - - - - - - + + diff --git a/android/java/brave-res/layout/activity_welcome_onboarding_default.xml b/android/java/brave-res/layout/activity_welcome_onboarding_default.xml deleted file mode 100644 index 40f0aa42f3c..00000000000 --- a/android/java/brave-res/layout/activity_welcome_onboarding_default.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -