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

Merge \"Add a \"Do not show\" checkbox in support disclaimer dialog.\" into nyc-mr1-dev

Browse Source 
am: d04b49649e

Change-Id: I25ff49cb0ce6ab6cb4cfb35aef254d3881e343e1
This commit is contained in:
Fan Zhang
2016-06-20 17:25:45 +00:00
committed by android-build-merger
parent 8008dee36c d04b49649e
commit 461b286de7
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/layout/support_disclaimer_content.xml
View File

@@ -24,6 +24,14 @@
android:id="@+id/support_disclaimer_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="24dp"
android:text="@string/support_disclaimer_content"/>
<CheckBox
android:id="@+id/support_disclaimer_do_not_show_again"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/support_disclaimer_do_not_show"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout>

3
res/values/strings.xml
View File

@@ -7546,6 +7546,9 @@
<!-- Dialog content displayed before initiating real time support [CHAR LIMIT=NONE]-->
<string name="support_disclaimer_content">To help address your issue quickly, we need system information for diagnosis.</string>
<!-- Checkbox text, when checked dialog will not show again [CHAR LIMIT=80] -->
<string name="support_disclaimer_do_not_show">Do not show again</string>
<!-- [CHAR LIMIT=60] Title of work profile setting page -->
<string name="managed_profile_settings_title">Work profile settings</string>
<!-- [CHAR LIMIT=60] The preference title for enabling cross-profile remote contact search -->