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

Commit b50cea02 authored by Filip Gruszczyński's avatar Filip Gruszczyński
Browse files

resolved conflicts for merge of 1569d61f to master 

Change-Id: I5bc751a2ae52a8d7542b5b49d27fc90b4a1c7673
parents cb20740e 1569d61f

core/java/android/view/ViewGroup.java

+2 −1
Original line number Diff line number Diff line
@@ -515,7 +515,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 


    private void initFromAttributes(

            Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ViewGroup);

        final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ViewGroup, defStyleAttr,

                defStyleRes);



        final int N = a.getIndexCount();

        for (int i = 0; i < N; i++) {

core/res/res/values/styles_micro.xml

+1 −0
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ 
        <item name="android:internalMinWidth">64dip</item>

        <item name="android:internalMaxHeight">180dip</item>

        <item name="virtualButtonPressedDrawable">?android:attr/selectableItemBackground</item>

        <item name="android:descendantFocusability">blocksDescendants</item>

    </style>

</resources>

core/res/res/values/themes_micro.xml

+2 −2

File changed.

Contains only whitespace changes.