Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 970291e2 authored by Christopher Tate's avatar Christopher Tate
Browse files

Make "Ask every time" actually work that way 

..in link-opening behavior.  If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.

Bug 23147746

Change-Id: I73d8893ab74ea0356b757ab836349243cda2e307
parent 9f879ef0

src/com/android/settings/applications/AppLaunchSettings.java

+3 −2
Original line number Diff line number Diff line
@@ -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