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

Commit 28fa07e1 authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 5021359 - show app icon for collapsible action views. 

Also fix a bug with initial enabled state of the app-home button.

Change-Id: I7eac4932deeced3ac209ad899922ac90f40c87e6
parent 8132ba5e

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

+2 −4
Original line number Diff line number Diff line
@@ -159,10 +159,8 @@ public class ActionBarImpl extends ActionBar { 


        // Older apps get the home button interaction enabled by default.

        // Newer apps need to enable it explicitly.

        if (mContext.getApplicationInfo().targetSdkVersion <

                Build.VERSION_CODES.ICE_CREAM_SANDWICH) {

            setHomeButtonEnabled(true);

        }

        setHomeButtonEnabled(mContext.getApplicationInfo().targetSdkVersion <

                Build.VERSION_CODES.ICE_CREAM_SANDWICH);

    }



    public void onConfigurationChanged(Configuration newConfig) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ public class ActionBarView extends AbsActionBarView { 
        @Override

        public boolean expandItemActionView(MenuBuilder menu, MenuItemImpl item) {

            mExpandedActionView = item.getActionView();

            mExpandedHomeLayout.setIcon(item.getIcon());

            mExpandedHomeLayout.setIcon(mIcon.getConstantState().newDrawable(getResources()));

            mCurrentExpandedItem = item;

            if (mExpandedActionView.getParent() != ActionBarView.this) {

                addView(mExpandedActionView);