javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3016 from NativeScript/issue-1799

Browse Source 
Fix: Enhancement: Android Actionbar elevation lost with background-color
This commit is contained in:
Rossen Hristov
2016-11-04 10:23:09 +02:00
committed by GitHub
parent c244af3e2b e507d6403a
commit 350498ef7b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tns-core-modules/ui/styling/background.android.ts
View File

@ -36,6 +36,13 @@ export module ad {
let _defaultBackgrounds = new Map<string, android.graphics.drawable.Drawable>(); let _defaultBackgrounds = new Map<string, android.graphics.drawable.Drawable>();
function isSetColorFilterOnlyWidget(nativeView: android.view.View): boolean {
return (
nativeView instanceof android.widget.Button ||
nativeView instanceof android.support.v7.widget.Toolbar
);
}
export function onBackgroundOrBorderPropertyChanged(v: view.View) { export function onBackgroundOrBorderPropertyChanged(v: view.View) {
let nativeView = <android.view.View>v._nativeView; let nativeView = <android.view.View>v._nativeView;
if (!nativeView) { if (!nativeView) {
@ -48,7 +55,8 @@ export module ad {
let backgroundDrawable = nativeView.getBackground(); let backgroundDrawable = nativeView.getBackground();
let density = utils.layout.getDisplayDensity(); let density = utils.layout.getDisplayDensity();
let cache = <CacheLayerType>v._nativeView; let cache = <CacheLayerType>v._nativeView;
if (v instanceof button.Button
if (isSetColorFilterOnlyWidget(nativeView)
&& !types.isNullOrUndefined(backgroundDrawable) && !types.isNullOrUndefined(backgroundDrawable)
&& types.isFunction(backgroundDrawable.setColorFilter) && types.isFunction(backgroundDrawable.setColorFilter)
&& !background.hasBorderWidth() && !background.hasBorderWidth()
@ -63,7 +71,7 @@ export module ad {
else if (!background.isEmpty()) { else if (!background.isEmpty()) {
if (!(backgroundDrawable instanceof org.nativescript.widgets.BorderDrawable)) { if (!(backgroundDrawable instanceof org.nativescript.widgets.BorderDrawable)) {
let viewClass = types.getClass(v); let viewClass = types.getClass(v);
if (!(v instanceof button.Button) && !_defaultBackgrounds.has(viewClass)) { if (!isSetColorFilterOnlyWidget(nativeView) && !_defaultBackgrounds.has(viewClass)) {
_defaultBackgrounds.set(viewClass, nativeView.getBackground()); _defaultBackgrounds.set(viewClass, nativeView.getBackground());
} }