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

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.
*/
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);
final TextView disclaimer = (TextView) content.findViewById(R.id.support_disclaimer_text);
disclaimer.setMovementMethod(LinkMovementMethod.getInstance());
final Activity activity = getActivity();
final SupportFeatureProvider supportFeatureProvider =
FeatureFactory.getFactory(activity).getSupportFeatureProvider(activity);
disclaimer.setText(supportFeatureProvider.getDisclaimerString());
stripUnderlines((Spannable) disclaimer.getText());
return builder
.setView(content)