PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ScrollView to include the full layout.

Browse Source 
1. Use ScrollView
2. Give ListView a fixed layout_height

Demo: https://screencast.googleplex.com/cast/NDg1NTE0OTI0MDUxNjYwOHxjNGVjYTA4OC03OQ

Bug: 276416718
Bug: 277153488
Test: manual
Change-Id: Ib1404bb060bf2ca448fe636db07b93c16ce14673
This commit is contained in:
danielwbhuang
2023-04-11 20:05:36 +08:00
parent 3f16621b86
commit d318ac5672
2 changed files with 95 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
res/layout/modifier_key_picker_dialog.xml
View File

@@ -14,94 +14,102 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/modifier_key_fragment_container" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:orientation="vertical" android:id="@+id/modifier_key_fragment_scroll_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" > android:layout_height="match_parent">
<LinearLayout android:orientation="vertical" <LinearLayout
android:layout_width="match_parent" android:id="@+id/modifier_key_fragment_container"
android:layout_height="match_parent" android:orientation="vertical"
android:divider="?android:dividerHorizontal" android:layout_width="match_parent"
android:showDividers="end" > android:layout_height="match_parent" >
<TextView
android:id="@+id/modifier_key_picker_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dip"
android:layout_marginBottom="8dip"
android:layout_gravity="center_horizontal"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/modifier_keys_picker_title"/>
<TextView <LinearLayout android:orientation="vertical"
android:id="@+id/modifier_key_picker_summary" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:divider="?android:dividerHorizontal"
android:showDividers="end" >
<TextView
android:id="@+id/modifier_key_picker_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/modifier_keys_picker_title"/>
<TextView
android:id="@+id/modifier_key_picker_summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout>
<LinearLayout android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="?android:dividerHorizontal"
android:showDividers="end">
<ListView
android:id="@+id/modifier_key_picker"
android:layout_width="wrap_content"
android:layout_height="352dp"
android:divider="@null"
android:dividerHeight="8dp"
android:padding="16dp"
android:listSelector="@drawable/modifier_key_lisetview_background"
/>
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dip" android:layout_marginStart="8dp"
android:layout_marginBottom="16dip" android:layout_marginEnd="8dp"
android:layout_gravity="center_horizontal" android:layout_marginTop="6dp"
android:singleLine="true" android:layout_marginBottom="6dp">
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"/> <Button
android:id="@+id/modifier_key_cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:layout_marginStart="8dp"
android:layout_alignParentStart="true"
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/ModifierKeyButtonCancel"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/modifier_keys_cancel"/>
<Button
android:id="@+id/modifier_key_done_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginBottom="6dp"
android:layout_marginEnd="8dp"
android:layout_alignParentEnd="true"
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/ModifierKeyButtonDone"
android:textColor="?androidprv:attr/materialColorOnPrimary"
android:text="@string/modifier_keys_done"/>
</RelativeLayout>
</LinearLayout> </LinearLayout>
</ScrollView>
<LinearLayout android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="?android:dividerHorizontal"
android:showDividers="end">
<ListView
android:id="@+id/modifier_key_picker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:divider="@null"
android:dividerHeight="8dp"
android:padding="16dip"
android:listSelector="@drawable/modifier_key_lisetview_background"
/>
</LinearLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dip"
android:layout_marginEnd="8dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
<Button
android:id="@+id/modifier_key_cancel_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_marginStart="8dip"
android:layout_alignParentStart="true"
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/ModifierKeyButtonCancel"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/modifier_keys_cancel"/>
<Button
android:id="@+id/modifier_key_done_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_marginEnd="8dip"
android:layout_alignParentEnd="true"
android:paddingVertical="14dp"
android:drawablePadding="9dp"
style="@style/ModifierKeyButtonDone"
android:textColor="?androidprv:attr/materialColorOnPrimary"
android:text="@string/modifier_keys_done"/>
</RelativeLayout>
</LinearLayout>

2
res/layout/modifier_key_reset_dialog.xml
View File

@@ -26,7 +26,6 @@
android:layout_marginTop="24dip" android:layout_marginTop="24dip"
android:layout_marginBottom="8dip" android:layout_marginBottom="8dip"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:text="@string/modifier_keys_reset_title" /> android:text="@string/modifier_keys_reset_title" />
@@ -39,7 +38,6 @@
android:layout_marginBottom="16dip" android:layout_marginBottom="16dip"
android:layout_marginStart="32dip" android:layout_marginStart="32dip"
android:layout_marginEnd="32dip" android:layout_marginEnd="32dip"
android:gravity="center"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"