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

Support dialog disclaimer text now appears properly

Browse Source 
The string override between Settings and SettigsGoogle was not properly
distinguishing, and was defaulting to the AOSP version.

Bug: 31827726
Test: Manual
Change-Id: Iebd8681fb4f040e956f05fb0f5d96deae9eec26f
This commit is contained in:
Matthew Fritze
2016-09-29 15:03:28 -07:00
parent 59d2b185f3
commit adc5555acf
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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)