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
This commit is contained in:
TreeHugger Robot
2017-08-15 01:18:27 +00:00
committed by Android (Google) Code Review
parent fdbe5d9f82 804b0daf49
commit 858ea46a3a
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

@@ -8782,8 +8782,8 @@
<!-- Section title for the Web Action preference [CHAR LIMIT=60] --> <!-- Section title for the Web Action preference [CHAR LIMIT=60] -->
<string name="web_action_section_title">Instant apps</string> <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] --> <!-- Preference label for an tappable preference that will open the instant apps settings. [CHAR LIMIT=60] -->
<string name="instant_apps_account">Instant apps account</string> <string name="instant_apps_settings">Instant Apps preferences</string>
<!-- Section title for the Domain URL app preference list [CHAR LIMIT=60]--> <!-- Section title for the Domain URL app preference list [CHAR LIMIT=60]-->
<string name="domain_url_section_title">Installed apps</string> <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; final Intent launchIntent = instantAppSettingsIntent;
// TODO: Make this button actually launch the account chooser. // TODO: Make this button actually launch the account chooser.
mInstantAppAccountPreference = new Preference(getPrefContext()); mInstantAppAccountPreference = new Preference(getPrefContext());
mInstantAppAccountPreference.setTitle(R.string.instant_apps_account); mInstantAppAccountPreference.setTitle(R.string.instant_apps_settings);
mInstantAppAccountPreference.setOnPreferenceClickListener(pref -> { mInstantAppAccountPreference.setOnPreferenceClickListener(pref -> {
startActivity(launchIntent); startActivity(launchIntent);
return true; return true;