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

Commit 0caca11d authored by Ruchi Kandoi's avatar Ruchi Kandoi Committed by android-build-merger
Browse files

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

Merge "Do not call setAlwaysButtonEnabled if the activity doesn't support defaults." into oc-mr1-dev
am: c1235a1f

Change-Id: I109b96ae365e102428fbe6c7174ebd140145e293
parents aad0ef1f c1235a1f

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