Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine the "Edit VPN profile" dialog layout

Browse Source 
- Limit the content layout height to leave enough height for the buttons at the bottom

Bug: 417389474
Flag: EXEMPT resource update only
Test: Manual testing

Change-Id: Idd66a1a3757b59b1bbea998fb17030541095acf6
This commit is contained in:
Weng Su
2025-05-21 20:42:13 +08:00
committed by Joey
parent 9c81af7a7f
commit 7d9db6ffe9
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/layout/vpn_dialog.xml
View File

@@ -13,12 +13,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:theme="@style/Theme.Network"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxHeight="@dimen/vpn_dialog_max_height"
android:orientation="vertical"
android:paddingTop="0dp"
android:paddingLeft="24dp"
@@ -234,18 +235,21 @@
android:text="@string/vpn_save_login"/>
</LinearLayout>
<LinearLayout android:id="@+id/connect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:animateLayoutChanges="true">
<CheckBox style="@style/vpn_value"
android:id="@+id/always_on_vpn"
android:text="@string/vpn_menu_lockdown"/>
<TextView style="@style/vpn_warning"
android:id="@+id/always_on_invalid_reason"
android:visibility="gone"/>
<LinearLayout
android:id="@+id/connect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/vpn_dialog_margin_bottom"
android:orientation="vertical"
android:animateLayoutChanges="true">
<CheckBox
android:id="@+id/always_on_vpn"
style="@style/vpn_value"
android:text="@string/vpn_menu_lockdown"/>
<TextView
android:id="@+id/always_on_invalid_reason"
style="@style/vpn_warning"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

4
res/values-land/dimens.xml
View File

@@ -33,4 +33,8 @@
<!-- Connected displays -->
<dimen name="display_topology_pane_margin">80dp</dimen>
<!-- VPN -->
<dimen name="vpn_dialog_max_height">212dp</dimen>
<dimen name="vpn_dialog_margin_bottom">8dp</dimen>
</resources>

4
res/values/dimens.xml
View File

@@ -564,4 +564,8 @@
<dimen name="locale_picker_dialog_title_padding">16dp</dimen>
<dimen name="locale_picker_dialog_message_padding_left_right">24dp</dimen>
<dimen name="locale_picker_dialog_message_padding_bottom">32dp</dimen>
<!-- VPN -->
<dimen name="vpn_dialog_max_height">600dp</dimen>
<dimen name="vpn_dialog_margin_bottom">132dp</dimen>
</resources>