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

Add help info at the bottom of the dialog

Browse Source 
It contains a link to help center

Bug: 68030013
Test: RunSettingsRoboTest
Change-Id: I79260eff35e604fa97cf21c62f58c02f3bbe5cfb
This commit is contained in:
jackqdyulei
2017-11-09 13:09:28 -08:00
parent ac870bed2f
commit fd69cd4c33
6 changed files with 191 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
res/layout/private_dns_mode_dialog.xml
View File

@@ -14,43 +14,56 @@
limitations under the License.
-->
<RadioGroup
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/private_dns_radio_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dip">
android:orientation="vertical"
android:padding="8dp">
<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_margin="8dip"/>
<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_opportunistic"
android:text="@string/private_dns_mode_opportunistic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="8dip"/>
<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_margin="8dp"/>
<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_margin="8dip"/>
<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_margin="8dp"/>
<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"
<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_margin="8dp"/>
<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"/>
</RadioGroup>
<TextView
android:id="@+id/private_dns_help_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="40dip"
android:layout_marginEnd="8dip"/>
</RadioGroup>
android:layout_marginTop="16dp"
android:paddingStart="16dp"
android:textAppearance="?android:attr/textAppearanceSmall"/>
</LinearLayout>

4
res/values/strings.xml
View File

@@ -2269,7 +2269,8 @@
<string name="emergency_address_title">Emergency Address</string>
<!-- Summary of Update Emergency Address preference, explaining usage of emergency address [CHAR LIMIT=NONE] -->
<string name="emergency_address_summary">Used as your location when you make an emergency call over Wi\u2011Fi</string>
<!-- Message of private dns that provides a help link. [CHAR LIMIT=NONE] -->
<string name="private_dns_help_message"><annotation id="url">Learn more</annotation> about Private DNS features</string>
<!-- Sound and alerts settings -->
<skip/>
@@ -6341,6 +6342,7 @@
<string name="help_url_icc_lock" translatable="false"></string>
<string name="help_uri_process_stats_summary" translatable="false"></string>
<string name="help_uri_process_stats_apps" translatable="false"></string>
<string name="help_uri_private_dns" translatable="false"></string>
<!-- User account title [CHAR LIMIT=30] -->
<string name="user_account_title">Account for content</string>