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

Commit 2efd89f7 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5179524 - ActionBar custom view inflation doesn't catch layout_gravity"

parents 3de51031 aad47fd7

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

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.ViewParent;

import android.view.Window;

import android.view.ViewGroup.LayoutParams;

import android.widget.AdapterView;

import android.widget.FrameLayout;

import android.widget.ImageView;
@@ -1079,6 +1080,11 @@ public class ActionBarView extends AbsActionBarView { 
        }

    }



    @Override

    public LayoutParams generateLayoutParams(AttributeSet attrs) {

        return new ActionBar.LayoutParams(getContext(), attrs);

    }



    @Override

    public LayoutParams generateLayoutParams(LayoutParams lp) {

        if (lp == null) {