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

Commit e6a70d6f authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Revert modifications to LinearLayout. 

These changes were originally required when theming was not able to do
low-level asset redirection.  Some legacy functionality may depend on
this, but it should be updated to the new approach.

Change-Id: I8304f5769d8ccab7c9c3ef0d77fd48ce98c718d5
parent 50e8a319

core/java/android/widget/LinearLayout.java

+2 −8
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 The Android Open Source Project

 * This code has been modified.  Portions copyright (C) 2010, T-Mobile USA, Inc.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -118,15 +117,10 @@ public class LinearLayout extends ViewGroup { 
    }



    public LinearLayout(Context context, AttributeSet attrs) {

        this(context, attrs, 0);

    }



    /** @hide pending api review */

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

        super(context, attrs, defStyle);

        super(context, attrs);



        TypedArray a = 

            context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.LinearLayout, defStyle, 0);

            context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.LinearLayout);



        int index = a.getInt(com.android.internal.R.styleable.LinearLayout_orientation, -1);

        if (index >= 0) {