diff options
| author | Christopher Tate <ctate@google.com> | 2015-07-17 13:15:12 -0700 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2015-07-17 16:11:41 -0700 |
| commit | 2eda36509f43ce208db811dd34fe8f0633fc6397 (patch) | |
| tree | 199fea5759c955e1d1ae58a42d4b38398803d799 /res | |
| parent | ddaa142a094a404d7c5e6d7eea93920f8ed16696 (diff) | |
| download | packages_apps_Settings-2eda36509f43ce208db811dd34fe8f0633fc6397.zip packages_apps_Settings-2eda36509f43ce208db811dd34fe8f0633fc6397.tar.gz packages_apps_Settings-2eda36509f43ce208db811dd34fe8f0633fc6397.tar.bz2 | |
Offer 'ask' as an available app-linking state
Bug 22532193
Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 9 | ||||
| -rw-r--r-- | res/xml/installed_app_launch_settings.xml | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 5c57f83..460b7c9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6580,6 +6580,15 @@ <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> apps can open their supported links</item> </plurals> + <!-- Explanation that the app that will ALWAYS be launched to open web links to domains that it understands --> + <string name="app_link_open_always">Open in this app</string> + + <!-- Explanation that the user will be asked whether to launch the app to open web links to domains that it understands --> + <string name="app_link_open_ask">Ask every time</string> + + <!-- Explanation that the app that will NEVER be launched to open web links to domains that it understands --> + <string name="app_link_open_never">Don’t open in this app</string> + <!-- Fingerprint hint message when finger was not recognized.--> <string name="fingerprint_not_recognized">Not recognized</string> diff --git a/res/xml/installed_app_launch_settings.xml b/res/xml/installed_app_launch_settings.xml index 7d6642c..e48476f 100644 --- a/res/xml/installed_app_launch_settings.xml +++ b/res/xml/installed_app_launch_settings.xml @@ -20,18 +20,16 @@ <PreferenceCategory android:key="app_launch_domain_links" android:title="@string/app_launch_domain_links_title"> - <SwitchPreference - android:key="app_launch_open_domain_urls" - android:title="@string/app_launch_open_domain_urls_title" - android:summary="@string/app_launch_open_domain_urls_summary" - /> - + <com.android.settings.DropDownPreference + android:key="app_link_state" + android:persistent="false" + android:title="@string/app_launch_open_domain_urls_title" /> <com.android.settings.applications.AppDomainsPreference android:key="app_launch_supported_domain_urls" android:title="@string/app_launch_supported_domain_urls_title" android:persistent="false" - android:dependency="app_launch_open_domain_urls" + android:dependency="app_link_state" /> </PreferenceCategory> |