commit 3a0e259063162bf86e761e7e9c99936d499a2c3d
author Dmitri Plotnikov <dplotnikov@google.com> Mon May 11 17:49:53 2009 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Mon May 11 17:49:53 2009 -0700
tree c6c9b34a439c30b04c2c661b7abb80dd7b8b73e6
parent 3adeeff54f4a74d89bb3d796698b64377ff195b6

Renaming ActivityStream to SocialStream to avoid confusion with Android Activities.

src/com/android/contacts/ContactsActivity.java

diff --git a/src/com/android/contacts/ContactsActivity.java b/src/com/android/contacts/ContactsActivity.java
index d78d19c..06254d3 100644
--- a/src/com/android/contacts/ContactsActivity.java
+++ b/src/com/android/contacts/ContactsActivity.java
@@ -64,8 +64,8 @@
         mTabHost.setOnTabChangedListener(this);
 
         // Setup the tabs
-        setupActivityStreamTab();
         setupContactsTab();
+        setupSocialStreamTab();
         setupFavoritesTab();
 
         setCurrentTab(intent);
@@ -89,13 +89,13 @@
         }
     }
 
-    private void setupActivityStreamTab() {
+    private void setupSocialStreamTab() {
         // Just a placeholder for now
-        Intent intent = new Intent("com.android.contacts.action.LIST_DEFAULT");
-        intent.setClass(this, ActivityStreamActivity.class);
+        Intent intent = new Intent("com.android.contacts.action.SOCIAL_STREAM");
+        intent.setClass(this, SocialStreamActivity.class);
 
-        mTabHost.addTab(mTabHost.newTabSpec("stream")
-                .setIndicator(getText(R.string.activityStreamIconLabel),
+        mTabHost.addTab(mTabHost.newTabSpec("social")
+                .setIndicator(getText(R.string.socialStreamIconLabel),
                         getResources().getDrawable(R.drawable.ic_tab_contacts))
                 .setContent(intent));
     }

src/com/android/contacts/SocialStreamActivity.java

diff --git a/src/com/android/contacts/ActivityStreamActivity.java b/src/com/android/contacts/SocialStreamActivity.java
similarity index 89%
rename from src/com/android/contacts/ActivityStreamActivity.java
rename to src/com/android/contacts/SocialStreamActivity.java
index 0440864..8917fb4 100644
--- a/src/com/android/contacts/ActivityStreamActivity.java
+++ b/src/com/android/contacts/SocialStreamActivity.java
@@ -20,13 +20,13 @@
 import android.os.Bundle;
 import android.widget.ArrayAdapter;
 
-public class ActivityStreamActivity extends ListActivity {
+public class SocialStreamActivity extends ListActivity {
 
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        setContentView(R.layout.activity_list_content);
+        setContentView(R.layout.social_list_content);
 
         setListAdapter(new ArrayAdapter<String>(this,
                 android.R.layout.simple_list_item_1));