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

Commit c829bf4f authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Do not call setAlwaysButtonEnabled if the activity doesn't... 

Merge "Merge "Do not call setAlwaysButtonEnabled if the activity doesn't support defaults." into oc-mr1-dev am: c1235a1f am: 0caca11d"
parents 98eaf2eb 1fecd07b

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

+2 −1
Original line number Diff line number Diff line
@@ -1941,7 +1941,8 @@ public class ResolverActivity extends Activity { 
            final int checkedPos = mAdapterView.getCheckedItemPosition();

            final boolean hasValidSelection = checkedPos != ListView.INVALID_POSITION;

            if (!useLayoutWithDefault()

                    && (!hasValidSelection || mLastSelected != checkedPos)) {

                    && (!hasValidSelection || mLastSelected != checkedPos)

                    && mAlwaysButton != null) {

                setAlwaysButtonEnabled(hasValidSelection, checkedPos, true);

                mOnceButton.setEnabled(hasValidSelection);

                if (hasValidSelection) {