Merge "Resolver - 'Always' button broken for non VIEW cases" into qt-dev

am: 914de104b3 Change-Id: I5583dde27c46f7130a540fce1476400767e7ec98
2019-07-03 16:55:05 -07:00
parent 790f8912a3 914de104b3
commit ef430bb118
1 changed files with 2 additions and 1 deletions
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -889,7 +889,8 @@ public class ResolverActivity extends Activity {
                : mAdapterView.getCheckedItemPosition();
        boolean hasIndexBeenFiltered = !mAdapter.hasFilteredItem();
        ResolveInfo ri = mAdapter.resolveInfoForPosition(which, hasIndexBeenFiltered);
-        if (!ri.handleAllWebDataURI && id == R.id.button_always) {
+        if (mUseLayoutForBrowsables
+                && !ri.handleAllWebDataURI && id == R.id.button_always) {
            showSettingsForSelected(ri);
        } else {
            startSelected(which, id == R.id.button_always, hasIndexBeenFiltered);