Updated all samples with group categories.

Change-Id: I96847d1359fc9dcdb9bb2d0f30b4b95f3124d56f
diff --git a/background/alarms/repeatingAlarm/template-params.xml b/background/alarms/repeatingAlarm/template-params.xml
index fdb96ba..b5a52bb 100644
--- a/background/alarms/repeatingAlarm/template-params.xml
+++ b/background/alarms/repeatingAlarm/template-params.xml
@@ -16,6 +16,7 @@
 -->
 <sample>
     <name>repeatingAlarm</name>
+    <group>Background</group>
     <package>com.example.android.repeatingalarm</package>
 
 
diff --git a/connectivity/bluetooth/BluetoothLeGatt/template-params.xml b/connectivity/bluetooth/BluetoothLeGatt/template-params.xml
index 9fa7737..323e1d7 100644
--- a/connectivity/bluetooth/BluetoothLeGatt/template-params.xml
+++ b/connectivity/bluetooth/BluetoothLeGatt/template-params.xml
@@ -14,9 +14,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>BluetoothLeGatt</name>
     <group>Connectivity</group>
diff --git a/connectivity/network/BasicNetworking/template-params.xml b/connectivity/network/BasicNetworking/template-params.xml
index 7ba0747..3413740 100644
--- a/connectivity/network/BasicNetworking/template-params.xml
+++ b/connectivity/network/BasicNetworking/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>BasicNetworking</name>
-    <group>NoGroup</group>
+    <group>Connectivity</group>
     <package>com.example.android.basicnetworking</package>
 
     <!-- change minSdk if needed-->
diff --git a/connectivity/network/NetworkConnect/template-params.xml b/connectivity/network/NetworkConnect/template-params.xml
index 82617f8..a1d5991 100644
--- a/connectivity/network/NetworkConnect/template-params.xml
+++ b/connectivity/network/NetworkConnect/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>NetworkConnect</name>
-    <group>NoGroup</group>
+    <group>Connectivity</group>
     <package>com.example.android.networkconnect</package>
 
 
diff --git a/connectivity/sync/BasicSyncAdapter/template-params.xml b/connectivity/sync/BasicSyncAdapter/template-params.xml
index ba1feff..7fba138 100644
--- a/connectivity/sync/BasicSyncAdapter/template-params.xml
+++ b/connectivity/sync/BasicSyncAdapter/template-params.xml
@@ -14,11 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>BasicSyncAdapter</name>
+    <group>Connectivity</group>
     <package>com.example.android.basicsyncadapter</package>
 
 
diff --git a/content/LoaderCursor/loadercursor.jd b/content/LoaderCursor/loadercursor.jd
deleted file mode 100644
index dba0a0f..0000000
--- a/content/LoaderCursor/loadercursor.jd
+++ /dev/null
@@ -1,14 +0,0 @@
-page.title=LoaderCursor Sample
-@jd:body
-
-<p>This sample demonstrates the use of the 
-<pre><a href="http://developer.android.com/reference/android/app/LoaderManager.html">LoaderManager
-</a></pre> to retrieve data from a 
-<pre><a href="http://developer.android.com/reference/android/database/Cursor.html">Cursor</a></pre>
-.</p>
-
-<p>Here, a list of contacts is displayed in a 
-<pre><a href="http://developer.android.com/reference/android/app/ListFragment.html">ListFragment
-</a></pre> and filtered using a 
-<pre><a href="http://developer.android.com/reference/android/widget/SearchView.html">SearchView
-</a></pre> ActionBar item.</p>
\ No newline at end of file
diff --git a/content/contacts/BasicContactables/template-params.xml b/content/contacts/BasicContactables/template-params.xml
index c3e0ce0..ee2ba11 100644
--- a/content/contacts/BasicContactables/template-params.xml
+++ b/content/contacts/BasicContactables/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>BasicContactables</name>
-    <group>NoGroup</group>
+    <group>Content</group>
     <package>com.example.android.basiccontactables</package>
 
 
diff --git a/content/documentsUi/StorageClient/template-params.xml b/content/documentsUi/StorageClient/template-params.xml
index 24bd071..f6843e7 100644
--- a/content/documentsUi/StorageClient/template-params.xml
+++ b/content/documentsUi/StorageClient/template-params.xml
@@ -16,8 +16,8 @@
 -->
 <sample>
     <name>StorageClient</name>
+    <group>Content</group>
     <package>com.example.android.storageclient</package>
-    <group>NoGroup</group>
     <!-- change minSdk if needed-->
     <minSdk>4</minSdk>
     <compileSdkVersion>19</compileSdkVersion>
diff --git a/content/multiuser/AppRestrictions/template-params.xml b/content/multiuser/AppRestrictions/template-params.xml
index 5fafd3b..fa676b2 100644
--- a/content/multiuser/AppRestrictions/template-params.xml
+++ b/content/multiuser/AppRestrictions/template-params.xml
@@ -14,9 +14,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>AppRestrictions</name>
     <group>Content</group>
diff --git a/input/gestures/BasicGestureDetect/template-params.xml b/input/gestures/BasicGestureDetect/template-params.xml
index 1feba01..fc8b48d 100644
--- a/input/gestures/BasicGestureDetect/template-params.xml
+++ b/input/gestures/BasicGestureDetect/template-params.xml
@@ -14,11 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>BasicGestureDetect</name>
+    <group>Input</group>
     <package>com.example.android.basicgesturedetect</package>
 
 
diff --git a/input/multitouch/BasicMultitouch/template-params.xml b/input/multitouch/BasicMultitouch/template-params.xml
index 7bd997f..7677818 100644
--- a/input/multitouch/BasicMultitouch/template-params.xml
+++ b/input/multitouch/BasicMultitouch/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>BasicMultitouch</name>
-    <group>NoGroup</group>
+    <group>Input</group>
     <package>com.example.android.basicmultitouch</package>
 
 
diff --git a/media/BasicMediaDecoder/template-params.xml b/media/BasicMediaDecoder/template-params.xml
index 8d412dc..bcb01af 100644
--- a/media/BasicMediaDecoder/template-params.xml
+++ b/media/BasicMediaDecoder/template-params.xml
@@ -14,9 +14,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>BasicMediaDecoder</name>
     <group>Media</group>
diff --git a/media/BasicMediaRouter/template-params.xml b/media/BasicMediaRouter/template-params.xml
index 4d14028..e7cbab5 100644
--- a/media/BasicMediaRouter/template-params.xml
+++ b/media/BasicMediaRouter/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>BasicMediaRouter</name>
-    <group>NoGroup</group>
+    <group>Media</group>
     <package>com.example.android.basicmediarouter</package>
 
 
diff --git a/security/keystore/BasicAndroidKeyStore/template-params.xml b/security/keystore/BasicAndroidKeyStore/template-params.xml
index 2498b88..d603dfa 100644
--- a/security/keystore/BasicAndroidKeyStore/template-params.xml
+++ b/security/keystore/BasicAndroidKeyStore/template-params.xml
@@ -14,11 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>BasicAndroidKeyStore</name>
+    <group>Security</group>
     <package>com.example.android.basicandroidkeystore</package>
 
     <!-- change minSdk if needed-->
diff --git a/testing/ActivityInstrumentation/template-params.xml b/testing/ActivityInstrumentation/template-params.xml
index 937e26e..4856a82 100644
--- a/testing/ActivityInstrumentation/template-params.xml
+++ b/testing/ActivityInstrumentation/template-params.xml
@@ -14,11 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>ActivityInstrumentation</name>
+    <group>Testing</group>
     <package>com.example.android.com.example.android.activityinstrumentation</package>
 
 
diff --git a/ui/accessibility/BasicAccessibility/template-params.xml b/ui/accessibility/BasicAccessibility/template-params.xml
index bc87c3b..af9d815 100644
--- a/ui/accessibility/BasicAccessibility/template-params.xml
+++ b/ui/accessibility/BasicAccessibility/template-params.xml
@@ -14,11 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>BasicAccessibility</name>
+    <group>UI</group>
     <package>com.example.android.basicaccessibility</package>
 
 
diff --git a/ui/actionbar/DoneBar/template-params.xml b/ui/actionbar/DoneBar/template-params.xml
index e343334..c5d1741 100644
--- a/ui/actionbar/DoneBar/template-params.xml
+++ b/ui/actionbar/DoneBar/template-params.xml
@@ -15,8 +15,6 @@
  limitations under the License.
 -->
 
-
-
 <sample>
     <name>DoneBar</name>
     <group>UI</group>
diff --git a/ui/actionbarcompat/Basic/template-params.xml b/ui/actionbarcompat/Basic/template-params.xml
index da35301..e940d2d 100644
--- a/ui/actionbarcompat/Basic/template-params.xml
+++ b/ui/actionbarcompat/Basic/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>Basic</name>
-    <group>NoGroup</group>
+    <group>UI</group>
     <package>com.example.android.actionbarcompat.basic</package>
 
     <dependency>com.android.support:appcompat-v7:18.0.+</dependency>
diff --git a/ui/actionbarcompat/ListPopupMenu/template-params.xml b/ui/actionbarcompat/ListPopupMenu/template-params.xml
index 4a67f36..0d23829 100644
--- a/ui/actionbarcompat/ListPopupMenu/template-params.xml
+++ b/ui/actionbarcompat/ListPopupMenu/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>ListPopupMenu</name>
-    <group>NoGroup</group>
+    <group>UI</group>
     <package>com.example.android.actionbarcompat.listpopupmenu</package>
 
     <dependency>com.android.support:appcompat-v7:18.0.+</dependency>
diff --git a/ui/actionbarcompat/ShareActionProvider/template-params.xml b/ui/actionbarcompat/ShareActionProvider/template-params.xml
index 722e830..cf6cb88 100644
--- a/ui/actionbarcompat/ShareActionProvider/template-params.xml
+++ b/ui/actionbarcompat/ShareActionProvider/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>ShareActionProvider</name>
-    <group>NoGroup</group>
+    <group>UI</group>
     <package>com.example.android.actionbarcompat.shareactionprovider</package>
 
     <dependency>com.android.support:appcompat-v7:18.0.+</dependency>
diff --git a/ui/actionbarcompat/Styled/template-params.xml b/ui/actionbarcompat/Styled/template-params.xml
index d602051..33577f0 100644
--- a/ui/actionbarcompat/Styled/template-params.xml
+++ b/ui/actionbarcompat/Styled/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>Styled</name>
-    <group>NoGroup</group>
+    <group>UI</group>
     <package>com.example.android.actionbarcompat.styled</package>
 
     <dependency>com.android.support:appcompat-v7:18.0.+</dependency>
diff --git a/ui/holo/BorderlessButtons/template-params.xml b/ui/holo/BorderlessButtons/template-params.xml
index 555782d..c0d9aeb 100644
--- a/ui/holo/BorderlessButtons/template-params.xml
+++ b/ui/holo/BorderlessButtons/template-params.xml
@@ -14,10 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
 <sample>
     <name>BorderlessButtons</name>
-    <group>NoGroup</group>
+    <group>UI</group>
     <package>com.example.android.borderlessbuttons</package>
 
     <!-- change minSdk if needed-->
diff --git a/ui/lists/CustomChoiceList/template-params.xml b/ui/lists/CustomChoiceList/template-params.xml
index 3275535..b58c0ac 100644
--- a/ui/lists/CustomChoiceList/template-params.xml
+++ b/ui/lists/CustomChoiceList/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>CustomChoiceList</name>
-    <group>NoGroup</group>
+    <group>UI</group>
     <package>com.example.android.customchoicelist</package>
 
     <!-- change minSdk if needed-->
diff --git a/ui/notifications/BasicNotifications/template-params.xml b/ui/notifications/BasicNotifications/template-params.xml
index 2d8776f..7118c24 100644
--- a/ui/notifications/BasicNotifications/template-params.xml
+++ b/ui/notifications/BasicNotifications/template-params.xml
@@ -17,9 +17,8 @@
 
 <sample>
     <name>BasicNotifications</name>
-    <group>NoGroup</group>
+    <group>UI</group>
     <package>com.example.android.basicnotifications</package>
-
     <!-- change minSdk if needed-->
     <minSdk>8</minSdk>
 
diff --git a/ui/notifications/CustomNotifications/template-params.xml b/ui/notifications/CustomNotifications/template-params.xml
index 279522c..ff90ca3 100644
--- a/ui/notifications/CustomNotifications/template-params.xml
+++ b/ui/notifications/CustomNotifications/template-params.xml
@@ -14,9 +14,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>CustomNotifications</name>
     <group>UI</group>
diff --git a/ui/views/HorizontalPaging/template-params.xml b/ui/views/HorizontalPaging/template-params.xml
index 28fc0db..e0546b1 100644
--- a/ui/views/HorizontalPaging/template-params.xml
+++ b/ui/views/HorizontalPaging/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>HorizontalPaging</name>
-    <group>NoGroup</group>
+    <group>UI</group>
     <package>com.example.android.horizontalpaging</package>
 
     <!-- change minSdk if needed-->
diff --git a/ui/views/TextSwitcher/template-params.xml b/ui/views/TextSwitcher/template-params.xml
index dffc256..365c708 100644
--- a/ui/views/TextSwitcher/template-params.xml
+++ b/ui/views/TextSwitcher/template-params.xml
@@ -14,12 +14,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>TextSwitcher</name>
-    <group>NoGroup</group>
+    <group>UI</group>
     <package>com.example.android.textswitcher</package>
 
     <!-- change minSdk if needed-->
diff --git a/ui/window/AdvancedImmersiveMode/template-params.xml b/ui/window/AdvancedImmersiveMode/template-params.xml
index 3ae1faa..0f23700 100644
--- a/ui/window/AdvancedImmersiveMode/template-params.xml
+++ b/ui/window/AdvancedImmersiveMode/template-params.xml
@@ -16,8 +16,8 @@
 -->
 <sample>
     <name>AdvancedImmersiveMode</name>
-    <package>com.example.android.advancedimmersivemode</package>
     <group>UI</group>
+    <package>com.example.android.advancedimmersivemode</package>
 
 
     <!-- change minSdk if needed-->
diff --git a/ui/window/BasicImmersiveMode/template-params.xml b/ui/window/BasicImmersiveMode/template-params.xml
index 5c7b73c..1335908 100644
--- a/ui/window/BasicImmersiveMode/template-params.xml
+++ b/ui/window/BasicImmersiveMode/template-params.xml
@@ -16,8 +16,8 @@
 -->
 <sample>
     <name>BasicImmersiveMode</name>
-    <package>com.example.android.basicimmersivemode</package>
     <group>UI</group>
+    <package>com.example.android.basicimmersivemode</package>
     
 
 
diff --git a/ui/window/ImmersiveMode/template-params.xml b/ui/window/ImmersiveMode/template-params.xml
index 88d3136..e053d26 100644
--- a/ui/window/ImmersiveMode/template-params.xml
+++ b/ui/window/ImmersiveMode/template-params.xml
@@ -18,6 +18,7 @@
     <name>ImmersiveMode</name>
     <group>UI</group>
     <package>com.example.android.immersivemode</package>
+    
     <compileSdkVersion>19</compileSdkVersion>
 
     <!--TODO: change minSdk if needed-->