diff options
| author | Christopher Tate <ctate@google.com> | 2015-07-20 17:06:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-20 17:06:27 +0000 |
| commit | b852fcbde9f5e0d92f5fc2ac8fc088eb114e3b63 (patch) | |
| tree | 77c678c32422cd4cd19f5ebdab1885f6be0cc87b /res/xml | |
| parent | bf9a425d5c3f61f02133084d11ab8481b0f53102 (diff) | |
| parent | 2eda36509f43ce208db811dd34fe8f0633fc6397 (diff) | |
| download | packages_apps_Settings-b852fcbde9f5e0d92f5fc2ac8fc088eb114e3b63.zip packages_apps_Settings-b852fcbde9f5e0d92f5fc2ac8fc088eb114e3b63.tar.gz packages_apps_Settings-b852fcbde9f5e0d92f5fc2ac8fc088eb114e3b63.tar.bz2 | |
Merge "Offer 'ask' as an available app-linking state" into mnc-dev
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/installed_app_launch_settings.xml | 12 |
1 files changed, 5 insertions, 7 deletions
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> |