commit b86c5ad00520cbb78a1f54f2778cb21df335f153
author David Herman <davidherman@google.com> Mon Jul 06 17:06:07 2015 -0700
committer David Herman <davidherman@google.com> Mon Jul 06 17:06:07 2015 -0700
tree 171e690ce3c65e494957136e67d60ca73825dd9e
parent 7e2ece060799271e5c405b74cca6747a1c89f95d

Service.xml UI tags now strictly typed

Change-Id: Iee31093a234c9e0e50fbcffe0ed4186f01114dca

resources/analytics/service.xml

diff --git a/resources/analytics/service.xml b/resources/analytics/service.xml
index 08094a7..ea199e1 100644
--- a/resources/analytics/service.xml
+++ b/resources/analytics/service.xml
@@ -9,85 +9,72 @@
     execute="recipe.xml">
 
   <uiGrid colDefinitions="100px,200px" visible="${google.isLoggedOut}">
-    <uiItem
+    <uiLabel
         row="0" col="0"
-        type="label"
         text="Account:"/>
 
-    <uiItem
+    <uiButton
         row="0" col="1"
-        type="button"
         text="Login to Google"
         action="${google.login()}"/>
   </uiGrid>
 
   <uiGrid colDefinitions="100px,Fit,Fit" visible="${google.analytics.hasNoAccount}">
-    <uiItem
+    <uiLabel
         row="0" col="0"
-        type="label"
         text="Accounts:"/>
 
-    <uiItem
+    <uiButton
         row="0" col="1"
-        type="button"
         text="Create Analytics Project"
         action="${google.analytics.createProject()}"/>
 
-    <uiItem
+    <uiButton
       row="0" col="2"
-      type="button"
       text="Refresh"
       action="${google.analytics.refreshProjects()}"/>
   </uiGrid>
 
 
   <uiGrid colDefinitions="100px,250px" visible="${google.analytics.hasAccount}">
-    <uiItem
+    <uiLabel
         row="0" col="0"
-        type="label"
         text="Accounts:"/>
 
-    <uiItem
+    <uiPulldown
         row="0" col="1"
-        type="pulldown"
         list="${google.analytics.accounts}"
         index="${google.analytics.accountIndex}"/>
 
-    <uiItem
+    <uiLabel
         row="1" col="0"
-        type="label"
         text="Properties:"/>
 
-    <uiItem
+    <uiPulldown
         row="1" col="1"
-        type="pulldown"
         list="${google.analytics.properties}"
         index="${google.analytics.propertyIndex}"/>
   </uiGrid>
 
   <uiGrid colDefinitions="100px,200px">
-    <uiItem
+    <uiLabel
         row="0" col="0"
-        type="label"
         text="Property Id:"/>
 
-    <uiItem
+    <uiInput
         row="0" col="1"
-        type="input"
         text="${google.analytics.propertyId}"
         enabled="${google.analytics.canEditPropertyId}"/>
   </uiGrid>
 
   <uiGrid colDefinitions="100px,Fit,Fit">
-    <uiItem
+    <uiCheckbox
       col="1"
-      type="checkbox"
       text="Enable Advertising ID"
       checked="${google.analytics.adsEnabled}"/>
 
-    <uiItem
+    <uiLink
       col="2"
-      type="link"
       text="What's this?"
       url="https://developers.google.com/analytics/devguides/collection/android/v4/#ad-id"/>
   </uiGrid>