diff options
| author | Chris Tate <ctate@android.com> | 2015-08-14 17:27:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-14 17:27:02 +0000 |
| commit | 7c8cb46fe383956830a04e079a13ded56f7c2154 (patch) | |
| tree | c974dd308ef91be19f933b99695f06118d17d4c3 /src/com/android/settings/applications | |
| parent | fa62043590d5ae99008aa1ddbd1e8b1f052fc0a1 (diff) | |
| parent | 36e2d32dab47f9d46c0234202c2a799c43b67c9e (diff) | |
| download | packages_apps_Settings-7c8cb46fe383956830a04e079a13ded56f7c2154.zip packages_apps_Settings-7c8cb46fe383956830a04e079a13ded56f7c2154.tar.gz packages_apps_Settings-7c8cb46fe383956830a04e079a13ded56f7c2154.tar.bz2 | |
am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '36e2d32dab47f9d46c0234202c2a799c43b67c9e':
Make "Ask every time" actually work that way
Diffstat (limited to 'src/com/android/settings/applications')
| -rw-r--r-- | src/com/android/settings/applications/AppLaunchSettings.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index b63bd7d..c885b02 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -39,6 +39,7 @@ import com.android.settings.Utils; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS; +import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER; import java.util.List; @@ -93,7 +94,7 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe mAppLinkState.addItem(R.string.app_link_open_always, INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS); mAppLinkState.addItem(R.string.app_link_open_ask, - INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK); + INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK); mAppLinkState.addItem(R.string.app_link_open_never, INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER); @@ -105,7 +106,7 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe final int state = mPm.getIntentVerificationStatus(mPackageName, UserHandle.myUserId()); mAppLinkState.setSelectedValue( (state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED) - ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK + ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK : state); // Set the callback only after setting the initial selected item |