Merge "Change strings from Instant app account to setting" into oc-mr1-dev

This commit is contained in:
TreeHugger Robot
2017-08-15 01:18:27 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 3 deletions

View File

@@ -8782,8 +8782,8 @@
<!-- Section title for the Web Action preference [CHAR LIMIT=60] -->
<string name="web_action_section_title">Instant apps</string>
<!-- Preference label for an tappable preference that will open the account chooser for instant apps. [CHAR LIMIT=60] -->
<string name="instant_apps_account">Instant apps account</string>
<!-- Preference label for an tappable preference that will open the instant apps settings. [CHAR LIMIT=60] -->
<string name="instant_apps_settings">Instant Apps preferences</string>
<!-- Section title for the Domain URL app preference list [CHAR LIMIT=60]-->
<string name="domain_url_section_title">Installed apps</string>

View File

@@ -141,7 +141,7 @@ public class ManageDomainUrls extends SettingsPreferenceFragment
final Intent launchIntent = instantAppSettingsIntent;
// TODO: Make this button actually launch the account chooser.
mInstantAppAccountPreference = new Preference(getPrefContext());
mInstantAppAccountPreference.setTitle(R.string.instant_apps_account);
mInstantAppAccountPreference.setTitle(R.string.instant_apps_settings);
mInstantAppAccountPreference.setOnPreferenceClickListener(pref -> {
startActivity(launchIntent);
return true;