am 99e89859: am ef1961c7: am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev

* commit '99e8985959682c510e7e2fac210768e2471b4b26':
  Offer 'ask' as an available app-linking state
This commit is contained in:
Christopher Tate
2015-07-20 18:38:23 +00:00
committed by Android Git Automerger
3 changed files with 73 additions and 42 deletions

View File

@@ -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>