diff --git a/android/BUILD.gn b/android/BUILD.gn index 821a617e719..3ec555836f0 100644 --- a/android/BUILD.gn +++ b/android/BUILD.gn @@ -111,6 +111,7 @@ android_resources("java_resources") { "java/brave-res/drawable-hdpi/copy_paste.png", "java/brave-res/drawable-hdpi/ic_ad_free_videos.png", "java/brave-res/drawable-hdpi/share_activity_background.png", + "java/brave-res/drawable-hdpi/vpn_install_bg.png", "java/brave-res/drawable-mdpi/brave_ads_launch_graphic.png", "java/brave-res/drawable-mdpi/brave_sync_btn_laptop.png", "java/brave-res/drawable-mdpi/btn_bat.png", @@ -124,6 +125,7 @@ android_resources("java_resources") { "java/brave-res/drawable-mdpi/copy_paste.png", "java/brave-res/drawable-mdpi/ic_ad_free_videos.png", "java/brave-res/drawable-mdpi/share_activity_background.png", + "java/brave-res/drawable-mdpi/vpn_install_bg.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", "java/brave-res/drawable-night/bookmark_empty_state_illustration.xml", @@ -156,6 +158,7 @@ android_resources("java_resources") { "java/brave-res/drawable-xhdpi/copy_paste.png", "java/brave-res/drawable-xhdpi/ic_ad_free_videos.png", "java/brave-res/drawable-xhdpi/share_activity_background.png", + "java/brave-res/drawable-xhdpi/vpn_install_bg.png", "java/brave-res/drawable-xxhdpi/brave_ads_launch_graphic.png", "java/brave-res/drawable-xxhdpi/brave_sync_btn_laptop.png", "java/brave-res/drawable-xxhdpi/btn_bat.png", @@ -169,6 +172,7 @@ android_resources("java_resources") { "java/brave-res/drawable-xxhdpi/copy_paste.png", "java/brave-res/drawable-xxhdpi/ic_ad_free_videos.png", "java/brave-res/drawable-xxhdpi/share_activity_background.png", + "java/brave-res/drawable-xxhdpi/vpn_install_bg.png", "java/brave-res/drawable-xxxhdpi/brave_ads_launch_graphic.png", "java/brave-res/drawable-xxxhdpi/brave_sync_btn_laptop.png", "java/brave-res/drawable-xxxhdpi/btn_bat.png", @@ -326,7 +330,6 @@ android_resources("java_resources") { "java/brave-res/drawable/ic_circle_down.xml", "java/brave-res/drawable/ic_circle_news_settings.xml", "java/brave-res/drawable/ic_clock.xml", - "java/brave-res/drawable/ic_close.xml", "java/brave-res/drawable/ic_coinbase.xml", "java/brave-res/drawable/ic_disabled.xml", "java/brave-res/drawable/ic_discount.xml", @@ -461,6 +464,7 @@ android_resources("java_resources") { "java/brave-res/drawable/tab_gradient_separator.xml", "java/brave-res/drawable/timer_rounded_bottomsheet.xml", "java/brave-res/drawable/unified_panel_background.xml", + "java/brave-res/drawable/vpn_install_phone.xml", "java/brave-res/drawable/vpn_paywall_bg.xml", "java/brave-res/drawable/vpn_paywall_selected_bg.xml", "java/brave-res/drawable/vpn_plan_action_gradient.xml", @@ -474,6 +478,7 @@ android_resources("java_resources") { "java/brave-res/drawable/widget_promo_panel_search_background.xml", "java/brave-res/layout-land/activity_brave_leo_plans.xml", "java/brave-res/layout-land/activity_brave_origin_plans.xml", + "java/brave-res/layout-land/activity_brave_vpn_profile.xml", "java/brave-res/layout-land/activity_vpn_paywall.xml", "java/brave-res/layout-sw600dp/activity_welcome_onboarding.xml", "java/brave-res/layout/activity_account_selector.xml", diff --git a/android/java/AndroidManifest.xml b/android/java/AndroidManifest.xml index a829927c791..f1236f0b565 100644 --- a/android/java/AndroidManifest.xml +++ b/android/java/AndroidManifest.xml @@ -78,7 +78,7 @@ diff --git a/android/java/brave-res/drawable-hdpi/vpn_install_bg.png b/android/java/brave-res/drawable-hdpi/vpn_install_bg.png new file mode 100644 index 00000000000..22501d6c49e Binary files /dev/null and b/android/java/brave-res/drawable-hdpi/vpn_install_bg.png differ diff --git a/android/java/brave-res/drawable-mdpi/vpn_install_bg.png b/android/java/brave-res/drawable-mdpi/vpn_install_bg.png new file mode 100644 index 00000000000..28cef802e32 Binary files /dev/null and b/android/java/brave-res/drawable-mdpi/vpn_install_bg.png differ diff --git a/android/java/brave-res/drawable-xhdpi/vpn_install_bg.png b/android/java/brave-res/drawable-xhdpi/vpn_install_bg.png new file mode 100644 index 00000000000..a0af66eb5ef Binary files /dev/null and b/android/java/brave-res/drawable-xhdpi/vpn_install_bg.png differ diff --git a/android/java/brave-res/drawable-xxhdpi/vpn_install_bg.png b/android/java/brave-res/drawable-xxhdpi/vpn_install_bg.png new file mode 100644 index 00000000000..0a9f9989c8a Binary files /dev/null and b/android/java/brave-res/drawable-xxhdpi/vpn_install_bg.png differ diff --git a/android/java/brave-res/drawable/ic_brave_vpn_graphic.xml b/android/java/brave-res/drawable/ic_brave_vpn_graphic.xml index 9fb4c4c27ef..1f4fad7f01b 100644 --- a/android/java/brave-res/drawable/ic_brave_vpn_graphic.xml +++ b/android/java/brave-res/drawable/ic_brave_vpn_graphic.xml @@ -1,248 +1,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/android/java/brave-res/drawable/ic_close.xml b/android/java/brave-res/drawable/ic_close.xml deleted file mode 100644 index 2b2b0041ffd..00000000000 --- a/android/java/brave-res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/android/java/brave-res/drawable/vpn_install_phone.xml b/android/java/brave-res/drawable/vpn_install_phone.xml new file mode 100644 index 00000000000..01a6081e8cb --- /dev/null +++ b/android/java/brave-res/drawable/vpn_install_phone.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/java/brave-res/layout-land/activity_brave_vpn_profile.xml b/android/java/brave-res/layout-land/activity_brave_vpn_profile.xml new file mode 100644 index 00000000000..3c92a5abaff --- /dev/null +++ b/android/java/brave-res/layout-land/activity_brave_vpn_profile.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/java/brave-res/layout/activity_brave_vpn_profile.xml b/android/java/brave-res/layout/activity_brave_vpn_profile.xml index 79bdea428c9..d1ca265565b 100644 --- a/android/java/brave-res/layout/activity_brave_vpn_profile.xml +++ b/android/java/brave-res/layout/activity_brave_vpn_profile.xml @@ -5,30 +5,31 @@ You can obtain one at https://mozilla.org/MPL/2.0/. --> - + android:background="@color/schemes_surface_container"> - + android:layout_height="match_parent" + android:orientation="vertical"> - - - + android:layout_height="wrap_content" + android:theme="@style/BraveVpnProfileToolbar" + android:minHeight="?attr/actionBarSize"/> + + - - - - - + - + - + - + + + + + + + + + diff --git a/android/java/brave-res/layout/optin_layout.xml b/android/java/brave-res/layout/optin_layout.xml index e18637820ba..d22702d4c43 100644 --- a/android/java/brave-res/layout/optin_layout.xml +++ b/android/java/brave-res/layout/optin_layout.xml @@ -15,7 +15,8 @@ android:layout_marginTop="10dp" android:layout_marginEnd="10dp" android:contentDescription="@string/close_text" - android:src="@drawable/ic_close" /> + android:src="@drawable/ic_close" + android:tint="@color/primitive_neutral_50" /> @android:color/white + + + + + +