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

Commit 056cbcb9 authored by Matt Pietal's avatar Matt Pietal Committed by android-build-merger
Browse files

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

am: ef430bb1

Change-Id: I8b50bd3c909dfef417339b544c6a1e338130fd64
parents a3a65839 ef430bb1

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -889,7 +889,8 @@ public class ResolverActivity extends Activity { 
                : mAdapterView.getCheckedItemPosition();

                : mAdapterView.getCheckedItemPosition();

        boolean hasIndexBeenFiltered = !mAdapter.hasFilteredItem();

        boolean hasIndexBeenFiltered = !mAdapter.hasFilteredItem();

        ResolveInfo ri = mAdapter.resolveInfoForPosition(which, hasIndexBeenFiltered);

        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);

            showSettingsForSelected(ri);

        } else {

        } else {

            startSelected(which, id == R.id.button_always, hasIndexBeenFiltered);

            startSelected(which, id == R.id.button_always, hasIndexBeenFiltered);