Trebuchet: Fix default cLock widget size on home screencm-10.1-M3

Patchset 2: Replaced PowerWidget by Apollo

Change-Id: I847be86e5488732512c26e6495322272a18f75b5

6 files changed, 36 insertions, 36 deletions

diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml
index 96cd86198..75941b040 100644
--- a/res/xml-sw600dp/default_workspace.xml
+++ b/res/xml-sw600dp/default_workspace.xml
@@ -19,13 +19,13 @@
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge"
         launcher:screen="1"
-        launcher:x="0"
-        launcher:y="3"
+        launcher:x="1"
+        launcher:y="0"
         launcher:spanX="4"
-        launcher:spanY="1" />
+        launcher:spanY="2" />
 
     <!-- Middle screen [2] -->
     <appwidget
@@ -34,7 +34,7 @@
         launcher:screen="2"
         launcher:x="0"
         launcher:y="0"
-        launcher:spanX="3"
+        launcher:spanX="4"
         launcher:spanY="3" />
     <favorite
         launcher:packageName="com.android.camera"
diff --git a/res/xml-sw600dp/default_workspace_no_telephony.xml b/res/xml-sw600dp/default_workspace_no_telephony.xml
index 233bb1809..2e2f8dbb3 100644
--- a/res/xml-sw600dp/default_workspace_no_telephony.xml
+++ b/res/xml-sw600dp/default_workspace_no_telephony.xml
@@ -19,13 +19,13 @@
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge"
         launcher:screen="1"
-        launcher:x="0"
-        launcher:y="3"
+        launcher:x="1"
+        launcher:y="0"
         launcher:spanX="4"
-        launcher:spanY="1" />
+        launcher:spanY="2" />
 
     <!-- Middle screen [2] -->
     <appwidget
@@ -34,7 +34,7 @@
         launcher:screen="2"
         launcher:x="0"
         launcher:y="0"
-        launcher:spanX="3"
+        launcher:spanX="4"
         launcher:spanY="3" />
     <favorite
         launcher:packageName="com.android.camera"
diff --git a/res/xml-sw720dp/default_workspace.xml b/res/xml-sw720dp/default_workspace.xml
index 95a8b31fb..fe3fcb3fb 100644
--- a/res/xml-sw720dp/default_workspace.xml
+++ b/res/xml-sw720dp/default_workspace.xml
@@ -19,13 +19,13 @@
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge"
         launcher:screen="1"
-        launcher:x="0"
-        launcher:y="3"
+        launcher:x="2"
+        launcher:y="0"
         launcher:spanX="4"
-        launcher:spanY="1" />
+        launcher:spanY="2" />
 
     <!-- Middle screen [2] -->
     <appwidget
@@ -34,8 +34,8 @@
         launcher:screen="2"
         launcher:x="0"
         launcher:y="0"
-        launcher:spanX="3"
-        launcher:spanY="4" />
+        launcher:spanX="4"
+        launcher:spanY="3" />
     <favorite
         launcher:packageName="com.android.camera"
         launcher:className="com.android.camera.Camera"
diff --git a/res/xml-sw720dp/default_workspace_no_telephony.xml b/res/xml-sw720dp/default_workspace_no_telephony.xml
index 34f8af445..521add902 100644
--- a/res/xml-sw720dp/default_workspace_no_telephony.xml
+++ b/res/xml-sw720dp/default_workspace_no_telephony.xml
@@ -19,13 +19,13 @@
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge"
         launcher:screen="1"
-        launcher:x="0"
-        launcher:y="3"
+        launcher:x="2"
+        launcher:y="0"
         launcher:spanX="4"
-        launcher:spanY="1" />
+        launcher:spanY="2" />
 
     <!-- Middle screen [2] -->
     <appwidget
@@ -34,8 +34,8 @@
         launcher:screen="2"
         launcher:x="0"
         launcher:y="0"
-        launcher:spanX="3"
-        launcher:spanY="4" />
+        launcher:spanX="4"
+        launcher:spanY="3" />
     <favorite
         launcher:packageName="com.android.camera"
         launcher:className="com.android.camera.Camera"
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index c3aa0895f..09f25b990 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -19,13 +19,13 @@
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge"
         launcher:screen="1"
         launcher:x="0"
-        launcher:y="3"
+        launcher:y="0"
         launcher:spanX="4"
-        launcher:spanY="1" />
+        launcher:spanY="2" />
 
     <!-- Middle screen [2] -->
     <appwidget
@@ -34,7 +34,7 @@
         launcher:screen="2"
         launcher:x="0"
         launcher:y="0"
-        launcher:spanX="3"
+        launcher:spanX="4"
         launcher:spanY="2" />
     <favorite
         launcher:packageName="com.android.camera"
diff --git a/res/xml/default_workspace_no_telephony.xml b/res/xml/default_workspace_no_telephony.xml
index 0e376cfc6..85ac2c728 100644
--- a/res/xml/default_workspace_no_telephony.xml
+++ b/res/xml/default_workspace_no_telephony.xml
@@ -19,13 +19,13 @@
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.android.settings"
-        launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
+        launcher:packageName="com.andrew.apollo"
+        launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge"
         launcher:screen="1"
         launcher:x="0"
-        launcher:y="3"
+        launcher:y="0"
         launcher:spanX="4"
-        launcher:spanY="1" />
+        launcher:spanY="2" />
 
     <!-- Middle screen [2] -->
     <appwidget
@@ -34,7 +34,7 @@
         launcher:screen="2"
         launcher:x="0"
         launcher:y="0"
-        launcher:spanX="3"
+        launcher:spanX="4"
         launcher:spanY="2" />
     <favorite
         launcher:packageName="com.android.camera"