From a12e559677d10a510f1c6a3977329bdde6da8748 Mon Sep 17 00:00:00 2001 From: deeppandya Date: Thu, 6 Jun 2024 00:37:09 -0400 Subject: [PATCH] Remove unused kill switch image resource Change image resource order --- android/brave_java_resources.gni | 2 - .../vpn/activities/VpnAlwaysOnActivity.java | 7 +- .../vpn/adapters/AlwaysOnPagerAdapter.java | 3 - .../res/drawable-night/ic_vpn_always_on_3.xml | 79 +++++++++--------- .../res/drawable-night/ic_vpn_always_on_4.xml | 80 ------------------- .../java/res/drawable/ic_vpn_always_on_3.xml | 12 +-- .../java/res/drawable/ic_vpn_always_on_4.xml | 65 --------------- 7 files changed, 44 insertions(+), 204 deletions(-) delete mode 100644 android/java/res/drawable-night/ic_vpn_always_on_4.xml delete mode 100644 android/java/res/drawable/ic_vpn_always_on_4.xml diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index 5eb23181124..6197f2e466c 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -137,7 +137,6 @@ brave_java_resources = [ "java/res/drawable-night/ic_vpn_always_on_1.xml", "java/res/drawable-night/ic_vpn_always_on_2.xml", "java/res/drawable-night/ic_vpn_always_on_3.xml", - "java/res/drawable-night/ic_vpn_always_on_4.xml", "java/res/drawable-night/incognito_history_placeholder_image.xml", "java/res/drawable-night/new_wallet.xml", "java/res/drawable-night/phone_recent_tab_empty_state_illustration.xml", @@ -614,7 +613,6 @@ brave_java_resources = [ "java/res/drawable/ic_vpn_always_on_1.xml", "java/res/drawable/ic_vpn_always_on_2.xml", "java/res/drawable/ic_vpn_always_on_3.xml", - "java/res/drawable/ic_vpn_always_on_4.xml", "java/res/drawable/ic_vpn_promo.xml", "java/res/drawable/ic_wallet_lock.xml", "java/res/drawable/ic_wallet_settings.xml", diff --git a/android/java/org/chromium/chrome/browser/vpn/activities/VpnAlwaysOnActivity.java b/android/java/org/chromium/chrome/browser/vpn/activities/VpnAlwaysOnActivity.java index d3058deda47..7b8bc583f83 100644 --- a/android/java/org/chromium/chrome/browser/vpn/activities/VpnAlwaysOnActivity.java +++ b/android/java/org/chromium/chrome/browser/vpn/activities/VpnAlwaysOnActivity.java @@ -5,11 +5,8 @@ package org.chromium.chrome.browser.vpn.activities; -import android.content.Intent; import android.view.MenuItem; -import android.view.View; import android.widget.Button; -import android.widget.TextView; import androidx.appcompat.app.ActionBar; import androidx.appcompat.widget.Toolbar; @@ -34,9 +31,7 @@ public class VpnAlwaysOnActivity extends AsyncInitializationActivity { ActionBar actionBar = getSupportActionBar(); assert actionBar != null; actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setTitle( - getResources() - .getString(R.string.always_on_vpn)); + actionBar.setTitle(getResources().getString(R.string.always_on_vpn)); ViewPager killSwitchTutorialViewPager = findViewById(R.id.kill_switch_tutorial_view_pager); diff --git a/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java b/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java index 6f54e01e254..49249d93861 100644 --- a/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java +++ b/android/java/org/chromium/chrome/browser/vpn/adapters/AlwaysOnPagerAdapter.java @@ -67,9 +67,6 @@ public class AlwaysOnPagerAdapter extends PagerAdapter { ImageView killSwitchTutorialImage = view.findViewById(R.id.kill_switch_tutorial_image); int killSwitchImage = mImageResources.get(position); - if (position == 2) { - killSwitchImage = R.drawable.ic_vpn_always_on_4; - } killSwitchTutorialImage.setImageResource(killSwitchImage); collection.addView(view); diff --git a/android/java/res/drawable-night/ic_vpn_always_on_3.xml b/android/java/res/drawable-night/ic_vpn_always_on_3.xml index e11526ba345..06864f6d9c9 100644 --- a/android/java/res/drawable-night/ic_vpn_always_on_3.xml +++ b/android/java/res/drawable-night/ic_vpn_always_on_3.xml @@ -1,8 +1,3 @@ - + + + + - - - - - - - - - + + + + + + + + diff --git a/android/java/res/drawable-night/ic_vpn_always_on_4.xml b/android/java/res/drawable-night/ic_vpn_always_on_4.xml deleted file mode 100644 index 06864f6d9c9..00000000000 --- a/android/java/res/drawable-night/ic_vpn_always_on_4.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/android/java/res/drawable/ic_vpn_always_on_3.xml b/android/java/res/drawable/ic_vpn_always_on_3.xml index 9337d3e250e..c4d26d683c3 100644 --- a/android/java/res/drawable/ic_vpn_always_on_3.xml +++ b/android/java/res/drawable/ic_vpn_always_on_3.xml @@ -44,7 +44,7 @@ tools:ignore="VectorPath" /> + android:pathData="M8,120C8,115.58 11.58,112 16,112H296C300.42,112 304,115.58 304,120V166C304,170.42 300.42,174 296,174H16C11.58,174 8,170.42 8,166V120Z" /> - - - diff --git a/android/java/res/drawable/ic_vpn_always_on_4.xml b/android/java/res/drawable/ic_vpn_always_on_4.xml deleted file mode 100644 index c4d26d683c3..00000000000 --- a/android/java/res/drawable/ic_vpn_always_on_4.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - -