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

Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev

Browse Source
This commit is contained in:
Matthew Fritze
2016-09-30 00:12:55 +00:00
committed by Android (Google) Code Review
parent 493bf348b9 adc5555acf
commit cf0f301250
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/support_disclaimer_content.xml
View File

@@ -24,8 +24,7 @@
android:id="@+id/support_disclaimer_text" android:id="@+id/support_disclaimer_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="24dp" android:paddingBottom="24dp"/>
android:text="@string/support_disclaimer_content"/>
<CheckBox <CheckBox
android:id="@+id/support_disclaimer_do_not_show_again" android:id="@+id/support_disclaimer_do_not_show_again"

3
res/values/strings.xml
View File

@@ -7698,9 +7698,6 @@
<!-- Dialog title displayed before initiating real time support [CHAR LIMIT=80]--> <!-- Dialog title displayed before initiating real time support [CHAR LIMIT=80]-->
<string name="support_disclaimer_title">Send system information</string> <string name="support_disclaimer_title">Send system information</string>
<!-- Dialog content displayed before initiating real time support [CHAR LIMIT=NONE]-->
<string name="support_disclaimer_content" product="default">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] --> <!-- Checkbox text, when checked dialog will not show again [CHAR LIMIT=80] -->
<string name="support_disclaimer_do_not_show">Do not show again</string> <string name="support_disclaimer_do_not_show">Do not show again</string>

5
src/com/android/settings/overlay/SupportFeatureProvider.java
View File

@@ -137,4 +137,9 @@ public interface SupportFeatureProvider {
* Returns an intent that will launch the tips and tricks UI. * Returns an intent that will launch the tips and tricks UI.
*/ */
Intent getTipsAndTricksIntent(Context context); Intent getTipsAndTricksIntent(Context context);
/**
* Returns the string for the disclaimer in the Support dialog
*/
String getDisclaimerString();
} }

4
src/com/android/settings/support/SupportDisclaimerDialogFragment.java
View File

@@ -68,6 +68,10 @@ public final class SupportDisclaimerDialogFragment extends DialogFragment implem
.inflate(R.layout.support_disclaimer_content, null); .inflate(R.layout.support_disclaimer_content, null);
final TextView disclaimer = (TextView) content.findViewById(R.id.support_disclaimer_text); final TextView disclaimer = (TextView) content.findViewById(R.id.support_disclaimer_text);
disclaimer.setMovementMethod(LinkMovementMethod.getInstance()); disclaimer.setMovementMethod(LinkMovementMethod.getInstance());
final Activity activity = getActivity();
final SupportFeatureProvider supportFeatureProvider =
FeatureFactory.getFactory(activity).getSupportFeatureProvider(activity);
disclaimer.setText(supportFeatureProvider.getDisclaimerString());
stripUnderlines((Spannable) disclaimer.getText()); stripUnderlines((Spannable) disclaimer.getText());
return builder return builder
.setView(content) .setView(content)