diff options
| author | Evan Chen <evanxinchen@google.com> | 2023-06-12 18:49:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-06-12 18:49:06 +0000 |
| commit | 4958345918e5929a01a23e0533625db43dafe5e6 (patch) | |
| tree | 5be10e3617160ed9b0fd9e43b6cef59a1cfa4bfe | |
| parent | 9256b14e9401fbde8221b2cb3e74cdf9f6b59eca (diff) | |
| parent | 3b11df521bb6676faeeefa1394429066a25d125d (diff) | |
| download | base-android12-dev.tar.gz | |
Merge "Fix CDM UI in largest display" into android12-devandroid12-dev
| -rw-r--r-- | packages/CompanionDeviceManager/res/layout/device_confirmation.xml | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/packages/CompanionDeviceManager/res/layout/device_confirmation.xml b/packages/CompanionDeviceManager/res/layout/device_confirmation.xml index 1336e79a855b..8abd646dd1ee 100644 --- a/packages/CompanionDeviceManager/res/layout/device_confirmation.xml +++ b/packages/CompanionDeviceManager/res/layout/device_confirmation.xml @@ -14,17 +14,25 @@ limitations under the License. --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/container" - android:layout_height="wrap_content" - style="@style/ContainerLayout" - > +<ScrollView + xmlns:android="http://schemas.android.com/apk/res/android" + android:scrollbars="none" + android:fillViewport="true" + android:clipChildren="false" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <include layout="@layout/title" /> + <LinearLayout + android:id="@+id/container" + android:layout_height="wrap_content" + style="@style/ContainerLayout"> - <include layout="@layout/profile_summary" /> + <include layout="@layout/title" /> - <include layout="@layout/buttons" /> + <include layout="@layout/profile_summary" /> -</LinearLayout>
\ No newline at end of file + <include layout="@layout/buttons" /> + + </LinearLayout> + +</ScrollView>
\ No newline at end of file |