OmniGears: change Time In State layout

Change-Id: I3ce2431435e5ff92d15968e56878da9fe8f3fda1
diff --git a/res/layout/spinner_item.xml b/res/layout/spinner_item.xml
index ee562fd..44544f0 100644
--- a/res/layout/spinner_item.xml
+++ b/res/layout/spinner_item.xml
@@ -23,7 +23,7 @@
     android:maxLines="1"
     android:ellipsize="marquee"
     android:gravity="center_vertical"
-    android:textColor="@color/system_activity_header_text"
+    android:textColor="?android:attr/textColorPrimary"
     android:textSize="16sp"
-    android:background="?android:attr/colorPrimary" >
+    android:background="?android:attr/colorPrimaryDark" >
 </TextView>
diff --git a/res/layout/time_in_state.xml b/res/layout/time_in_state.xml
index a06cdff..29ae1b3 100644
--- a/res/layout/time_in_state.xml
+++ b/res/layout/time_in_state.xml
@@ -28,20 +28,19 @@
         android:paddingTop="10dp"
         android:paddingStart="20dp"
         android:paddingEnd="10dp"
-        android:background="?android:attr/colorPrimary" >
+        android:background="?android:attr/colorPrimaryDark" >
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/spinner_period_title"
-            android:textColor="@color/system_activity_header_text"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="16sp" />
         <Spinner
             android:id="@+id/period_type_select"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:backgroundTint="@color/system_activity_header_text" />
+            android:gravity="center_vertical" />
     </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
@@ -51,14 +50,14 @@
         android:paddingBottom="10dp"
         android:paddingStart="20dp"
         android:paddingEnd="10dp"
-        android:background="?android:attr/colorPrimary" >
+        android:background="?android:attr/colorPrimaryDark" >
         <TextView
             android:id="@+id/ui_total_state_time"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
-            android:textColor="@color/system_activity_header_text"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="16sp" />
         <CheckBox
             android:id="@+id/ui_core_switch"
@@ -66,16 +65,16 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/state_core_mode"
-            android:textColor="@color/system_activity_header_text"
-            android:buttonTint="@color/system_activity_header_text"/>
+            android:textColor="?android:attr/textColorPrimary"
+            android:buttonTint="?android:attr/textColorPrimary"/>
         <CheckBox
             android:id="@+id/ui_mode_switch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/state_time_mode"
-            android:textColor="@color/system_activity_header_text"
-            android:buttonTint="@color/system_activity_header_text"/>
+            android:textColor="?android:attr/textColorPrimary"
+            android:buttonTint="?android:attr/textColorPrimary"/>
     </LinearLayout>
 
     <ScrollView