From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Thu, 18 Nov 2021 10:27:34 +0800 Subject: [PATCH] Move display of VPN version into summary text Move the display of version text within VPN into summary part of the display, and limit the height of summary area. Bug: 205460459 Test: install apk from b/205460459#comment3 and verify (cherry picked from commit 144f295d7aa66bae8556ba030553a49615eab0b2) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dddd74a491a206178feb10d5ef983d5cd273504d) Merged-In: I666b9db356feeebf04e3be688897c2d9110a5275 Change-Id: I666b9db356feeebf04e3be688897c2d9110a5275 --- res/values/strings.xml | 2 +- res/values/styles.xml | 10 ++++ res/xml/vpn_app_management.xml | 14 ++++- .../settings/vpn2/AppManagementFragment.java | 51 +++++++++++++++++-- 4 files changed, 71 insertions(+), 6 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 2180ea45f60..f6e3b0f62df 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6613,7 +6613,7 @@ Disconnect - Version %s + Version Forget VPN diff --git a/res/values/styles.xml b/res/values/styles.xml index d3d3199f62b..ec66bc8d1b8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -197,6 +197,16 @@ @android:style/TextAppearance.DeviceDefault.Small + + + +