Merge "Resolver - 'Always' button broken for non VIEW cases" into qt-dev am: 914de104b3

am: ef430bb118 Change-Id: Ib168d0e8fa6eb436a215b0a0a01119a81627c571
2019-07-03 18:23:30 -07:00
parent 432a2283b7 ef430bb118
commit 5153eb6f4e
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);