diff -r 2e2dc3d30ca8 -r 341166945d65 homescreenapp/stateplugins/hsapplibrarystateplugin/resource/applibrary.docml
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/applibrary.docml	Thu Jun 24 13:11:40 2010 +0100
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/resource/applibrary.docml	Fri Jun 25 19:19:22 2010 +0300
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.0">
+<hbdocument version="1.1">
     <object name="allAppsAction" type="HbAction">
         <bool name="checkable" value="TRUE"/>
         <icon iconName="qtg_mono_applications_all" name="icon"/>
@@ -18,6 +18,7 @@
     <widget name="view" type="HbView">
         <widget name="container" role="HbView:widget" type="HbWidget">
             <widget name="collectionLabel" type="HbGroupBox">
+
                 <sizehint height="6un" type="MAXIMUM" width="100un"/>
                 <bool name="visible" value="FALSE"/>
                 <string name="heading" value="."/>
@@ -38,12 +39,9 @@
         <widget name="allAppsView" type="HbView">
             <widget name="allAppsContainer" role="HbView:widget" type="HbWidget">
                 <widget name="allAppsListView" type="HbListView">
-                    <widget name="listViewItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
-                        <enums name="graphicsSize" value="LargeIcon"/>
-                    </widget>
                     <bool name="itemRecycling" value="TRUE"/>
                     <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="100un"/>
+                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
                     <bool name="frictionEnabled" value="TRUE"/>
                     <bool name="visible" value="TRUE"/>
                 </widget>
@@ -75,12 +73,9 @@
                     <bool name="visible" value="FALSE"/>
                 </widget>
                 <widget name="allAppsSearchListView" type="HbListView">
-                    <widget name="listViewItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
-                        <enums name="graphicsSize" value="LargeIcon"/>
-                    </widget>
                     <bool name="itemRecycling" value="TRUE"/>
                     <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="100un"/>
+                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
                     <bool name="frictionEnabled" value="TRUE"/>
                     <bool name="visible" value="TRUE"/>
                 </widget>
@@ -98,12 +93,9 @@
         <widget name="allCollectionsView" type="HbView">
             <widget name="allCollectionsContainer" role="HbView:widget" type="HbWidget">
                 <widget name="allCollectionsListView" type="HbListView">
-                    <widget name="listViewItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
-                        <enums name="graphicsSize" value="LargeIcon"/>
-                    </widget>
                     <bool name="itemRecycling" value="TRUE"/>
                     <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="100un"/>
+                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
                     <bool name="frictionEnabled" value="TRUE"/>
                     <bool name="visible" value="TRUE"/>
                 </widget>
@@ -136,12 +128,9 @@
                     <bool name="visible" value="FALSE"/>
                 </widget>
                 <widget name="allCollectionsSearchListView" type="HbListView">
-                    <widget name="listViewItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
-                        <enums name="graphicsSize" value="LargeIcon"/>
-                    </widget>
                     <bool name="itemRecycling" value="TRUE"/>
                     <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="100un"/>
+                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
                     <bool name="frictionEnabled" value="TRUE"/>
                     <bool name="visible" value="TRUE"/>
                 </widget>
@@ -159,19 +148,16 @@
         <widget name="installedAppsView" type="HbView">
             <widget name="installedAppsContainer" role="HbView:widget" type="HbWidget">
                 <widget name="installedAppsLabel" type="HbGroupBox">
-                    <sizehint height="6un" type="MAXIMUM" width="100un"/>
-                    <string name="heading" value="."/>
+                    <string locid="txt_applib_subtitle_installed" name="heading"/>
                     <bool name="marqueeHeading" value="TRUE"/>
+                    <sizehint height="6un" type="MAXIMUM" width="-1"/>
                     <fontspec name="fontSpec" role="Title" textheight="0"/>
                     <integer name="groupBoxType" value="1"/>
                 </widget>
                 <widget name="installedAppsListView" type="HbListView">
-                    <widget name="listViewItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
-                        <enums name="graphicsSize" value="LargeIcon"/>
-                    </widget>
                     <bool name="itemRecycling" value="TRUE"/>
                     <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="100un"/>
+                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
                     <bool name="frictionEnabled" value="TRUE"/>
                     <bool name="visible" value="TRUE"/>
                 </widget>
@@ -202,9 +188,9 @@
         <widget name="installedAppsView" type="HbView">
             <widget name="installedAppsContainer" role="HbView:widget" type="HbWidget">
                 <widget name="installedAppsLabel" type="HbGroupBox">
-                    <sizehint height="6un" type="MAXIMUM" width="100un"/>
-                    <string name="heading" value="."/>
+                    <string locid="txt_applib_subtitle_installed" name="heading"/>
                     <bool name="marqueeHeading" value="TRUE"/>
+                    <sizehint height="6un" type="MAXIMUM" width="-1"/>
                     <fontspec name="fontSpec" role="Title" textheight="0"/>
                     <integer name="groupBoxType" value="1"/>
                 </widget>
@@ -217,12 +203,9 @@
                     <bool name="visible" value="FALSE"/>
                 </widget>
                 <widget name="installedAppsSearchListView" type="HbListView">
-                    <widget name="listViewItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
-                        <enums name="graphicsSize" value="LargeIcon"/>
-                    </widget>
                     <bool name="itemRecycling" value="TRUE"/>
                     <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="100un"/>
+                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
                     <bool name="frictionEnabled" value="TRUE"/>
                     <bool name="visible" value="TRUE"/>
                 </widget>
@@ -246,9 +229,9 @@
         <widget name="installedAppsView" type="HbView">
             <widget name="installedAppsContainer" role="HbView:widget" type="HbWidget">
                 <widget name="installedAppsLabel" type="HbGroupBox">
-                    <sizehint height="6un" type="MAXIMUM" width="100un"/>
-                    <string name="heading" value="."/>
+                    <string locid="txt_applib_subtitle_installed" name="heading"/>
                     <bool name="marqueeHeading" value="TRUE"/>
+                    <sizehint height="6un" type="MAXIMUM" width="-1"/>
                     <fontspec name="fontSpec" role="Title" textheight="0"/>
                     <integer name="groupBoxType" value="1"/>
                 </widget>
@@ -266,14 +249,14 @@
                 </widget>
                 <widget name="installedAppsEmpytLabelContainer" type="HbWidget">
                     <widget name="installedAppsEmptyLabel" type="HbLabel">
+                        <enums name="alignment" value="AlignHCenter"/>
                         <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Minimum" verticalStretch="0"/>
                         <sizehint height="10un" type="MINIMUM" width="50un"/>
                         <sizehint height="10un" type="MAXIMUM" width="50un"/>
+                        <enums name="elideMode" value="ElideMiddle"/>
+                        <bool name="visible" value="TRUE"/>
                         <string locid="txt_applib_formlabel_empty" name="plainText"/>
-                        <fontspec name="fontSpec" role="Title" textheight="4un" />
-                        <enums name="elideMode" value="ElideMiddle"/>
-                        <enums name="alignment" value="AlignHCenter"/>
-                        <bool name="visible" value="TRUE"/>
+                        <fontspec name="fontSpec" role="Title" textheight="4un"/>
                     </widget>
                     <sizehint height="11.9403un" type="PREFERRED" width="23.8806un"/>
                     <layout orientation="Horizontal" type="linear">
@@ -303,12 +286,9 @@
                     <integer name="groupBoxType" value="1"/>
                 </widget>
                 <widget name="collectionListView" type="HbListView">
-                    <widget name="listViewItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
-                        <enums name="graphicsSize" value="LargeIcon"/>
-                    </widget>
                     <bool name="itemRecycling" value="TRUE"/>
                     <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="100un"/>
+                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
                     <bool name="frictionEnabled" value="TRUE"/>
                     <bool name="visible" value="TRUE"/>
                 </widget>
@@ -329,7 +309,7 @@
                     <sizehint height="0un" type="MINIMUM" width="0un"/>
                     <sizehint height="0un" type="MAXIMUM" width="0un"/>
                     <bool name="visible" value="FALSE"/>
-                </widget>                
+                </widget>
                 <layout orientation="Vertical" type="linear">
                     <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
                     <linearitem itemname="collectionLabel"/>
@@ -357,12 +337,9 @@
                     <bool name="visible" value="FALSE"/>
                 </widget>
                 <widget name="collectionSearchListView" type="HbListView">
-                    <widget name="listViewItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
-                        <enums name="graphicsSize" value="LargeIcon"/>
-                    </widget>
                     <bool name="itemRecycling" value="TRUE"/>
                     <enums name="horizontalScrollBarPolicy" value="ScrollBarAutoHide"/>
-                    <sizehint height="100un" type="MAXIMUM" width="100un"/>
+                    <sizehint height="100un" type="MAXIMUM" width="-1"/>
                     <bool name="frictionEnabled" value="TRUE"/>
                     <bool name="visible" value="TRUE"/>
                 </widget>
@@ -465,14 +442,14 @@
                 </widget>
                 <widget name="collectionEmpytLabelContainer" type="HbWidget">
                     <widget name="collectionAppsEmptyLabel" type="HbLabel">
+                        <enums name="alignment" value="AlignHCenter"/>
                         <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Minimum" verticalStretch="0"/>
                         <sizehint height="10un" type="MINIMUM" width="50un"/>
                         <sizehint height="10un" type="MAXIMUM" width="50un"/>
+                        <enums name="elideMode" value="ElideMiddle"/>
+                        <bool name="visible" value="TRUE"/>
                         <string locid="txt_applib_formlabel_empty" name="plainText"/>
                         <fontspec name="fontSpec" role="Title" textheight="4un"/>
-                        <enums name="elideMode" value="ElideMiddle"/>
-                        <enums name="alignment" value="AlignHCenter"/>                        
-                        <bool name="visible" value="TRUE"/>
                     </widget>
                     <sizehint height="11.9403un" type="PREFERRED" width="23.8806un"/>
                     <layout orientation="Horizontal" type="linear">
@@ -493,19 +470,19 @@
             <bool name="contentFullScreen" value="FALSE"/>
         </widget>
     </section>
-    <metadata activeUIState="collection view with empty label state" display="NHD portrait" unit="un">
+    <metadata activeUIState="collection view with empty label state" display="NHD-3.2-inch_portrait" unit="un">
         <uistate name="Common ui state" sections="#common"/>
-        <uistate name="all apps view state" sections="#common commonDefinition allAppsViewDefinition"/>
-        <uistate name="all apps search view state" sections="#common commonDefinition allAppsSearchViewDefinition"/>
-        <uistate name="all collections view state" sections="#common commonDefinition allCollectionsViewDefinition"/>
-        <uistate name="all collections search view state" sections="#common commonDefinition allCollectionsSearchViewDefinition"/>
-        <uistate name="installed apps view state" sections="#common commonDefinition installedAppsViewDefinition"/>
-        <uistate name="installed apps search view state" sections="#common commonDefinition installedAppsSearchViewDefinition"/>
-        <uistate name="installed apps empty view state" sections="#common commonDefinition installedAppsEmptyLabelViewDefinition"/>
-        <uistate name="collection view state" sections="#common commonDefinition collectionViewDefinition"/>
-        <uistate name="collection search view state" sections="#common commonDefinition collectionSearchViewDefinition"/>
-        <uistate name="collection view with button state" sections="#common commonDefinition collectionButtonViewDefinition"/>
-        <uistate name="collection view with empty label state" sections="#common commonDefinition collectionEmptyLabelViewDefinition"/>
+        <uistate name="all apps view state" sections="#common allAppsViewDefinition"/>
+        <uistate name="all apps search view state" sections="#common allAppsSearchViewDefinition"/>
+        <uistate name="all collections view state" sections="#common allCollectionsViewDefinition"/>
+        <uistate name="all collections search view state" sections="#common allCollectionsSearchViewDefinition"/>
+        <uistate name="installed apps view state" sections="#common installedAppsViewDefinition"/>
+        <uistate name="installed apps search view state" sections="#common installedAppsSearchViewDefinition"/>
+        <uistate name="installed apps empty view state" sections="#common installedAppsEmptyLabelViewDefinition"/>
+        <uistate name="collection view state" sections="#common collectionViewDefinition"/>
+        <uistate name="collection search view state" sections="#common collectionSearchViewDefinition"/>
+        <uistate name="collection view with button state" sections="#common collectionButtonViewDefinition"/>
+        <uistate name="collection view with empty label state" sections="#common collectionEmptyLabelViewDefinition"/>
         <dummydata objectName="allAppsListView" section="allAppsViewDefinition" value="app_list_template5"/>
         <dummydata objectName="allAppsSearchListView" section="allAppsViewDefinition" value="app_list_template5"/>
         <dummydata objectName="allAppsListView" section="allAppsSearchViewDefinition" value="app_list_template5"/>