From d674d806aac2bd6b99438ef03a23b4c8f09c034f Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Mon, 7 Nov 2016 14:12:02 +0200
Subject: [PATCH] Use setColorFilter on post-21 ActionBars only

---
 apps/app/ui-tests-app/action-bar/background.xml   | 2 +-
 tns-core-modules/ui/styling/background.android.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/app/ui-tests-app/action-bar/background.xml b/apps/app/ui-tests-app/action-bar/background.xml
index 264286eed..c03793a64 100644
--- a/apps/app/ui-tests-app/action-bar/background.xml
+++ b/apps/app/ui-tests-app/action-bar/background.xml
@@ -8,6 +8,6 @@
     </ActionBar>
   </Page.actionBar>
   <StackLayout>
-    <Button text="go to cleared page" tap="navigate"/>
+    <Button text="go to cleared page" tap="navigate" style="background-color: green;"/>
   </StackLayout>
 </Page>
\ No newline at end of file
diff --git a/tns-core-modules/ui/styling/background.android.ts b/tns-core-modules/ui/styling/background.android.ts
index 83e9344db..2d47e0af8 100644
--- a/tns-core-modules/ui/styling/background.android.ts
+++ b/tns-core-modules/ui/styling/background.android.ts
@@ -39,7 +39,9 @@ export module ad {
     function isSetColorFilterOnlyWidget(nativeView: android.view.View): boolean {
         return ( 
             nativeView instanceof android.widget.Button || 
-            nativeView instanceof android.support.v7.widget.Toolbar
+            (nativeView instanceof android.support.v7.widget.Toolbar 
+            && getSDK() >= 21 // There is an issue with the DrawableContainer which was fixed for API version 21 and above: https://code.google.com/p/android/issues/detail?id=60183
+            )
         ); 
     }