summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Controls
diff options
context:
space:
mode:
authorSamantha Houts <samantha@teamredwall.com>2016-06-28 10:25:45 (GMT)
committerRui Marinho <me@ruimarinho.net>2016-06-28 10:25:45 (GMT)
commit0772a5278b96f289ff216f10da86b072bc6edbf1 (patch)
treedbf54e33abc93749d230b6ba6996abcd653f5d89 /Xamarin.Forms.Controls
parent589adbd3ef145ec85f9fe64eda008251c1cdb745 (diff)
downloadxamarin-forms-0772a5278b96f289ff216f10da86b072bc6edbf1.zip
xamarin-forms-0772a5278b96f289ff216f10da86b072bc6edbf1.tar.gz
xamarin-forms-0772a5278b96f289ff216f10da86b072bc6edbf1.tar.bz2
[iOS] Default BarTextColor/BarBackgroundColor will no longer override values set in custom renderers (#233)beta-2.3.1-pre1
* [Controls] Improve TabbedPage test case iOS should default to the color used in a custom renderer instead of to the global default color. * [iOS] TabbedPage Bar*Color default is better Will use the color set by a custom renderer, if any, instead of always pulling from global appearance.
Diffstat (limited to 'Xamarin.Forms.Controls')
-rw-r--r--Xamarin.Forms.Controls/CoreGallery.cs15
1 files changed, 10 insertions, 5 deletions
diff --git a/Xamarin.Forms.Controls/CoreGallery.cs b/Xamarin.Forms.Controls/CoreGallery.cs
index bf4fe39..8fd1f7b 100644
--- a/Xamarin.Forms.Controls/CoreGallery.cs
+++ b/Xamarin.Forms.Controls/CoreGallery.cs
@@ -96,12 +96,17 @@ namespace Xamarin.Forms.Controls
{
AutomationId = "TabbedPageRoot";
- BarBackgroundColor = Color.Maroon;
- BarTextColor = Color.Yellow;
- Device.StartTimer(TimeSpan.FromSeconds(2), () => {
- BarBackgroundColor = Color.Default;
- BarTextColor = Color.Default;
+ Device.StartTimer(TimeSpan.FromSeconds(6), () => {
+ BarBackgroundColor = Color.Maroon;
+ BarTextColor = Color.Yellow;
+
+ Device.StartTimer(TimeSpan.FromSeconds(6), () => {
+ BarBackgroundColor = Color.Default;
+ BarTextColor = Color.Default;
+
+ return false;
+ });
return false;
});