Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'b05ef5e4ef992998894b3b6b644f1ca405889bfc':
  Only read foreground attr for FrameLayouts for targetSdkVersion < M
This commit is contained in:
Adam Powell
2015-06-15 19:49:41 +00:00
committed by Android Git Automerger
parent 74b54c5178 b05ef5e4ef
commit e032baa9fc
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/view/View.java
View File

@@ -56,6 +56,8 @@ import android.graphics.Shader;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.hardware.display.DisplayManagerGlobal; import android.hardware.display.DisplayManagerGlobal;
import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
@@ -95,6 +97,7 @@ import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.Checkable; import android.widget.Checkable;
import android.widget.FrameLayout;
import android.widget.ScrollBarDrawable; import android.widget.ScrollBarDrawable;
import static android.os.Build.VERSION_CODES.*; import static android.os.Build.VERSION_CODES.*;
@@ -4274,23 +4277,33 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
PROVIDER_BACKGROUND)); PROVIDER_BACKGROUND));
break; break;
case R.styleable.View_foreground: case R.styleable.View_foreground:
setForeground(a.getDrawable(attr)); if (targetSdkVersion >= VERSION_CODES.MNC || this instanceof FrameLayout) {
setForeground(a.getDrawable(attr));
}
break; break;
case R.styleable.View_foregroundGravity: case R.styleable.View_foregroundGravity:
setForegroundGravity(a.getInt(attr, Gravity.NO_GRAVITY)); if (targetSdkVersion >= VERSION_CODES.MNC || this instanceof FrameLayout) {
setForegroundGravity(a.getInt(attr, Gravity.NO_GRAVITY));
}
break; break;
case R.styleable.View_foregroundTintMode: case R.styleable.View_foregroundTintMode:
setForegroundTintMode(Drawable.parseTintMode(a.getInt(attr, -1), null)); if (targetSdkVersion >= VERSION_CODES.MNC || this instanceof FrameLayout) {
setForegroundTintMode(Drawable.parseTintMode(a.getInt(attr, -1), null));
}
break; break;
case R.styleable.View_foregroundTint: case R.styleable.View_foregroundTint:
setForegroundTintList(a.getColorStateList(attr)); if (targetSdkVersion >= VERSION_CODES.MNC || this instanceof FrameLayout) {
setForegroundTintList(a.getColorStateList(attr));
}
break; break;
case R.styleable.View_foregroundInsidePadding: case R.styleable.View_foregroundInsidePadding:
if (mForegroundInfo == null) { if (targetSdkVersion >= VERSION_CODES.MNC || this instanceof FrameLayout) {
mForegroundInfo = new ForegroundInfo(); if (mForegroundInfo == null) {
mForegroundInfo = new ForegroundInfo();
}
mForegroundInfo.mInsidePadding = a.getBoolean(attr,
mForegroundInfo.mInsidePadding);
} }
mForegroundInfo.mInsidePadding = a.getBoolean(attr,
mForegroundInfo.mInsidePadding);
break; break;
case R.styleable.View_scrollIndicators: case R.styleable.View_scrollIndicators:
final int scrollIndicators = final int scrollIndicators =