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

Commit d54530e9 authored by Filip Gruszczyński's avatar Filip Gruszczyński Committed by Android Git Automerger
Browse files

am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev 

* commit '1ae480a2':
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
parents a05e7526 1ae480a2

core/java/android/view/ViewGroup.java

+4 −5
Original line number Diff line number Diff line
@@ -463,13 +463,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
    public ViewGroup(Context context, AttributeSet attrs) {

        super(context, attrs);

        initViewGroup();

        initFromAttributes(context, attrs);

        initFromAttributes(context, attrs, 0);

    }



    public ViewGroup(Context context, AttributeSet attrs, int defStyle) {

        super(context, attrs, defStyle);

        initViewGroup();

        initFromAttributes(context, attrs);

        initFromAttributes(context, attrs, defStyle);

    }



    private boolean debugDraw() {
@@ -499,9 +499,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        mPersistentDrawingCache = PERSISTENT_SCROLLING_CACHE;

    }



    private void initFromAttributes(Context context, AttributeSet attrs) {

        TypedArray a = context.obtainStyledAttributes(attrs,

                R.styleable.ViewGroup);

    private void initFromAttributes(Context context, AttributeSet attrs, int defStyle) {

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



        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.