commit 942f44037bf5de9dd23a0785f50c07e1a668fc06
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu May 25 16:28:38 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 25 16:28:38 2023 +0000
tree 382e52cbd8e29de5a7e98179840fe1c5331b86fa
parent fff4eaf7c426bdc49dc81e21e487a6eb76f2ed8e
parent 9ca2f2646e35de34509df4cdc54c8fc2791698c2

Merge "CTS-VERIFIER - Security : CA Cert install via intent, Set New password Complexity tests layouts are not scrolling"

apps/CtsVerifier/res/layout/ca_install_via_intent.xml

diff --git a/apps/CtsVerifier/res/layout/ca_install_via_intent.xml b/apps/CtsVerifier/res/layout/ca_install_via_intent.xml
index 4b529d1..38d75b7 100644
--- a/apps/CtsVerifier/res/layout/ca_install_via_intent.xml
+++ b/apps/CtsVerifier/res/layout/ca_install_via_intent.xml
@@ -13,7 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+ <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -47,5 +51,5 @@
 
     <include layout="@layout/pass_fail_buttons" />
 
-</LinearLayout>
-
+ </LinearLayout>
+</ScrollView>

apps/CtsVerifier/res/layout/pass_fail_set_password_complexity.xml

diff --git a/apps/CtsVerifier/res/layout/pass_fail_set_password_complexity.xml b/apps/CtsVerifier/res/layout/pass_fail_set_password_complexity.xml
index e8cb0ff..b8b2825 100644
--- a/apps/CtsVerifier/res/layout/pass_fail_set_password_complexity.xml
+++ b/apps/CtsVerifier/res/layout/pass_fail_set_password_complexity.xml
@@ -17,13 +17,19 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:orientation="vertical">
     <LinearLayout android:layout_width="match_parent"
                   android:layout_height="match_parent"
                   android:layout_alignParentTop="true"
                   android:layout_alignParentStart="true"
                   android:orientation="vertical"
                   android:divider="@android:color/white"
-                  android:showDividers="middle">
+                  android:showDividers="middle"
+                  android:paddingBottom="30dp">
 
         <LinearLayout android:layout_height="wrap_content"
                       android:layout_width="wrap_content"
@@ -83,6 +89,7 @@
         </LinearLayout>
 
     </LinearLayout>
+    </ScrollView>
 
     <include android:layout_width="match_parent"
              android:layout_height="wrap_content"