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

Add scrollview for dns dialog

Browse Source 
Also update dialog to appcompat to avoid the crash

Change-Id: Ide6483f1160713dae8111de533a8b3345a3420c2
Fixes: 111351793
Test: Manual
This commit is contained in:
jackqdyulei
2018-07-13 13:23:33 -07:00
parent baea63bf72
commit c7867c80d4
1 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
res/layout/private_dns_mode_dialog.xml
View File

@@ -14,61 +14,68 @@
limitations under the License.
-->
<LinearLayout
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
android:layout_height="wrap_content">
<RadioGroup
android:id="@+id/private_dns_radio_group"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RadioButton
android:id="@+id/private_dns_mode_off"
android:text="@string/private_dns_mode_off"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:minHeight="48dp"/>
<RadioButton
android:id="@+id/private_dns_mode_opportunistic"
android:text="@string/private_dns_mode_opportunistic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:minHeight="48dp"/>
<RadioButton
android:id="@+id/private_dns_mode_provider"
android:text="@string/private_dns_mode_provider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:minHeight="48dp"/>
<EditText
android:id="@+id/private_dns_mode_provider_hostname"
android:hint="@string/private_dns_mode_provider_hostname_hint"
style="@android:style/Widget.CompoundButton.RadioButton"
android:imeOptions="actionDone"
android:inputType="textFilter|textUri"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="40dp"
android:layout_marginEnd="8dp"
android:minHeight="48dp"/>
</RadioGroup>
<TextView
android:id="@+id/private_dns_help_info"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:minHeight="48dp"
android:paddingStart="16dp"
android:textAppearance="?android:attr/textAppearanceSmall"/>
</LinearLayout>
android:orientation="vertical"
android:padding="8dp">
<RadioGroup
android:id="@+id/private_dns_radio_group"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RadioButton
android:id="@+id/private_dns_mode_off"
android:text="@string/private_dns_mode_off"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:minHeight="48dp"/>
<RadioButton
android:id="@+id/private_dns_mode_opportunistic"
android:text="@string/private_dns_mode_opportunistic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:minHeight="48dp"/>
<RadioButton
android:id="@+id/private_dns_mode_provider"
android:text="@string/private_dns_mode_provider"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:minHeight="48dp"/>
<EditText
android:id="@+id/private_dns_mode_provider_hostname"
android:hint="@string/private_dns_mode_provider_hostname_hint"
style="@android:style/Widget.CompoundButton.RadioButton"
android:imeOptions="actionDone"
android:inputType="textFilter|textUri"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="40dp"
android:layout_marginEnd="8dp"
android:minHeight="48dp"/>
</RadioGroup>
<TextView
android:id="@+id/private_dns_help_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:minHeight="48dp"
android:paddingStart="16dp"
android:textAppearance="?android:attr/textAppearanceSmall"/>
</LinearLayout>
</ScrollView>