commit 6e61f2e6bde9a9024eb2e4696fa76f692ea78a65
author Michael Jurka <mikejurka@google.com> Fri Nov 16 18:38:04 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 16 18:38:04 2012 -0800
tree b72acadb45a9697c72d53629ccd57289f6238d5e
parent 52097f5cc6c54f79afb0122271de6313ce64b431
parent c814031b354c7e8c44ef55c301d4ff1242a04d12

am c814031b: am aa01c088: am ffc2682a: Fix NPE

* commit 'c814031b354c7e8c44ef55c301d4ff1242a04d12':
  Fix NPE

fill_screens.py

diff --git a/fill_screens.py b/fill_screens.py
index 5841b8e..a887792 100755
--- a/fill_screens.py
+++ b/fill_screens.py
@@ -20,7 +20,7 @@
   "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():

res/xml-sw600dp/default_workspace.xml

diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml
index 3afb3b7..0537169 100644
--- 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"

res/xml/default_workspace.xml

diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index f2f4240..93338d3 100644
--- 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"

res/xml/update_workspace.xml

diff --git a/res/xml/update_workspace.xml b/res/xml/update_workspace.xml
index 44a3f9e..ba35b15 100644
--- 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"