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

Commit b05ef5e4 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 417018f2: Merge "Only read foreground attr for FrameLayouts for... 

am 417018f2: Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev

* commit '417018f2':
  Only read foreground attr for FrameLayouts for targetSdkVersion < M
parents 3f37869c 417018f2

core/java/android/view/View.java

+21 −8
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ import android.graphics.Shader; 
import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.hardware.display.DisplayManagerGlobal;

import android.os.Build;

import android.os.Build.VERSION_CODES;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;
@@ -95,6 +97,7 @@ import android.view.inputmethod.EditorInfo; 
import android.view.inputmethod.InputConnection;

import android.view.inputmethod.InputMethodManager;

import android.widget.Checkable;

import android.widget.FrameLayout;

import android.widget.ScrollBarDrawable;















import static android.os.Build.VERSION_CODES.*;










@@ -4274,23 +4277,33 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













                            PROVIDER_BACKGROUND));















                    break;















                case R.styleable.View_foreground:













                    if (targetSdkVersion >= VERSION_CODES.MNC || this instanceof FrameLayout) {















                        setForeground(a.getDrawable(attr));













                    }















                    break;















                case R.styleable.View_foregroundGravity:













                    if (targetSdkVersion >= VERSION_CODES.MNC || this instanceof FrameLayout) {















                        setForegroundGravity(a.getInt(attr, Gravity.NO_GRAVITY));













                    }















                    break;















                case R.styleable.View_foregroundTintMode:













                    if (targetSdkVersion >= VERSION_CODES.MNC || this instanceof FrameLayout) {















                        setForegroundTintMode(Drawable.parseTintMode(a.getInt(attr, -1), null));













                    }















                    break;















                case R.styleable.View_foregroundTint:













                    if (targetSdkVersion >= VERSION_CODES.MNC || this instanceof FrameLayout) {















                        setForegroundTintList(a.getColorStateList(attr));













                    }















                    break;















                case R.styleable.View_foregroundInsidePadding:













                    if (targetSdkVersion >= VERSION_CODES.MNC || this instanceof FrameLayout) {















                        if (mForegroundInfo == null) {















                            mForegroundInfo = new ForegroundInfo();















                        }















                        mForegroundInfo.mInsidePadding = a.getBoolean(attr,















                                mForegroundInfo.mInsidePadding);













                    }















                    break;















                case R.styleable.View_scrollIndicators:















                    final int scrollIndicators =