Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update changes for always on to auto reconnect (#28615)

Browse Source 
* Update changes for always on to auto reconnect

* ADd quotes to hightlight Block connections without VPN
This commit is contained in:
Deep Pandya
2025-04-13 23:16:06 +02:00
committed by GitHub
parent 9ebc033e95
commit 2cfff090f4
10 changed files with 133 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/res/layout/activity_vpn_always_on.xml → android/java/res/layout/activity_auto_reconnect_vpn.xml
+4 -4
View File
@@ -23,14 +23,14 @@
android:minHeight="?attr/actionBarSize"/>
<org.chromium.chrome.browser.custom_layout.HeightWrappingViewPager
android:id="@+id/kill_switch_tutorial_view_pager"
android:id="@+id/auto_reconnect_vpn_tutorial_view_pager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="24dp"/>
<com.google.android.material.tabs.TabLayout
android:id="@+id/kill_switch_tutorial_tab_layout"
android:id="@+id/auto_reconnect_vpn_tutorial_tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/vpn_plan_margin"
@@ -40,7 +40,7 @@
app:tabIndicatorHeight="0dp"/>
<android.widget.Button
android:id="@+id/kill_switch_action_button"
android:id="@+id/auto_reconnect_vpn_action_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
@@ -52,7 +52,7 @@
android:paddingVertical="12dp"
android:paddingHorizontal="16dp"
android:textAllCaps="false"
android:text="@string/kill_switch_action_text"
android:text="@string/auto_reconnect_vpn_action_text"
android:textColor="@android:color/white" />
</LinearLayout>
</ScrollView>
android/java/res/layout/auto_reconnect_vpn_tutorial_item_layout.xml
+53
View File
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2025 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/. -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/DefaultRegular"
android:textAlignment="center"
android:textColor="@color/text_secondary"
android:text="@string/how_to_turn_on"
android:layout_marginVertical="16dp"
android:layout_gravity="center_horizontal"/>
<ImageView
android:id="@+id/auto_reconnect_vpn_tutorial_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:layout_marginBottom="24dp"
android:layout_gravity="center_horizontal"/>
<TextView
android:id="@+id/auto_reconnect_vpn_tutorial_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/LargeRegular"
android:layout_marginBottom="24dp"
android:textColor="@color/text_primary"
android:textAlignment="center"
android:layout_gravity="center_horizontal"/>
<TextView
android:id="@+id/auto_reconnect_vpn_tutorial_warning_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
style="@style/LargeRegular"
android:layout_marginBottom="24dp"
android:textColor="@color/system_feedback_error"
android:textAlignment="textStart"/>
</LinearLayout>
android/java/res/layout/kill_switch_tutorial_item_layout.xml
-39
View File
@@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/DefaultRegular"
android:textAlignment="center"
android:textColor="@color/text_secondary"
android:text="@string/how_to_turn_on"
android:layout_marginVertical="16dp"
android:layout_gravity="center_horizontal"/>
<ImageView
android:id="@+id/kill_switch_tutorial_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:layout_marginBottom="24dp"
android:layout_gravity="center_horizontal"/>
<TextView
android:id="@+id/kill_switch_tutorial_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/LargeRegular"
android:layout_marginBottom="24dp"
android:textColor="@color/text_primary"
android:textAlignment="center"
android:layout_gravity="center_horizontal"/>
</LinearLayout>
android/java/res/xml/brave_vpn_preferences.xml
+2 -2
View File
@@ -40,8 +40,8 @@
android:key="server_change_location"/>
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:key="always_on"
android:title="@string/always_on_vpn"/>
android:key="auto_reconnect_vpn"
android:title="@string/auto_reconnect_vpn"/>
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:key="split_tunneling"