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

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

Browse Source 
am: 858ea46a3a

Change-Id: I22fb4b6d3ee5456a591f8dfa8f78d9f6d6da82dd
This commit is contained in:
Jesse Evans
2017-08-15 01:37:07 +00:00
committed by android-build-merger
parent 52744ebaf1 858ea46a3a
commit eee0e82fba
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -8784,8 +8784,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>

2
src/com/android/settings/applications/ManageDomainUrls.java
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;