am 2ee4be8d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...

* commit '2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae':

diff --git a/fill_screens.py b/fill_screens.py
index 5841b8e..a887792 100755 (executable)
--- a/fill_screens.py
+++ b/fill_screens.py
@@ -20,7 +20,7 @@ APPLICATION_COMPONENTS = [
   "com.android.settings/com.android.settings.Settings",
   "com.android.mms/com.android.mms.ui.ConversationList",
   "com.android.contacts/com.android.contacts.activities.PeopleActivity",
-  "com.android.contacts/com.android.contacts.activities.DialtactsActivity"
+  "com.android.dialer/com.android.dialer.DialtactsActivity"
 ]
 
 def usage():

diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml
index 3afb3b7..0537169 100644 (file)
--- a/res/xml-sw600dp/default_workspace.xml
+++ b/res/xml-sw600dp/default_workspace.xml
@@ -61,8 +61,8 @@
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.activities.DialtactsActivity"
+        launcher:packageName="com.android.dialer"
+        launcher:className="com.android.dialer.DialtactsActivity"
         launcher:container="-101"
         launcher:screen="1"
         launcher:x="1"

diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index f2f4240..93338d3 100644 (file)
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -61,8 +61,8 @@
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.activities.DialtactsActivity"
+        launcher:packageName="com.android.dialer"
+        launcher:className="com.android.dialer.DialtactsActivity"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="0"

diff --git a/res/xml/update_workspace.xml b/res/xml/update_workspace.xml
index 44a3f9e..ba35b15 100644 (file)
--- a/res/xml/update_workspace.xml
+++ b/res/xml/update_workspace.xml
@@ -19,8 +19,8 @@
          package name. -->
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <favorite
-        launcher:packageName="com.android.contacts"
-        launcher:className="com.android.contacts.activities.DialtactsActivity"
+        launcher:packageName="com.android.dialer"
+        launcher:className="com.android.dialer.DialtactsActivity"
         launcher:container="-101"
         launcher:screen="0"
         launcher:x="0"