commit 914de104b3b9861364b247aeb8d244e30744c757
author Matt Pietal <mpietal@google.com> Wed Jul 03 20:11:59 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 03 20:11:59 2019 +0000
tree fd267274a78988a2e141770a0a3efe9fa0d7497f
parent fb4fab4fa333222b7b66bc88eeeb261b960e01f3
parent a310c1fa3a14bc27423a75c4e747f43ed33645d6

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

core/java/com/android/internal/app/ResolverActivity.java

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index f905ea2..58ce03b 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -889,7 +889,8 @@
                 : 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);