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

Commit d1f4a17e authored by Yu Shan Emily Lau's avatar Yu Shan Emily Lau Committed by Android Git Automerger
Browse files

Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base

parents c5eeedc9 f20d6cf1

core/java/com/android/internal/widget/ActionBarContextView.java

+5 −5
Original line number Diff line number Diff line
@@ -140,12 +140,12 @@ public class ActionBarContextView extends ViewGroup { 
            mCloseButton = new ImageButton(getContext());

            mCloseButton.setImageDrawable(mCloseDrawable);

            mCloseButton.setBackgroundDrawable(null);

        }

        mCloseButton.setOnClickListener(new OnClickListener() {

            public void onClick(View v) {

                mode.finish();

            }

        });

        }

        addView(mCloseButton);



        final MenuBuilder menu = (MenuBuilder) mode.getMenu();