diff options
author | Scott Su <scott.su@myriadgroup.com> | 2009-08-24 11:41:06 +0800 |
---|---|---|
committer | Wei Huang <weih@google.com> | 2009-08-23 23:39:37 -0700 |
commit | b15e8849f978b19856ead6d57e99006f6c52b490 (patch) | |
tree | 27f5d04a2792d8c1a1d022dc4d93023cdf6b36a8 /src/com/android/im | |
parent | 3a623dfea097ca2e30534a44df3600d7c1894e39 (diff) | |
download | IM-b15e8849f978b19856ead6d57e99006f6c52b490.tar.gz |
Fix bug that Google Talk is shown on IM's landing page
Copy consts defined in framework/base/im to IM app
Diffstat (limited to 'src/com/android/im')
-rw-r--r-- | src/com/android/im/app/ImApp.java | 17 | ||||
-rw-r--r-- | src/com/android/im/app/ImPluginHelper.java | 1 | ||||
-rw-r--r-- | src/com/android/im/app/LandingPage.java | 4 | ||||
-rw-r--r-- | src/com/android/im/app/ProviderListItem.java | 2 |
4 files changed, 9 insertions, 15 deletions
diff --git a/src/com/android/im/app/ImApp.java b/src/com/android/im/app/ImApp.java index 1f23efd..c02522a 100644 --- a/src/com/android/im/app/ImApp.java +++ b/src/com/android/im/app/ImApp.java @@ -17,6 +17,12 @@ package com.android.im.app; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + import android.app.Activity; import android.app.Application; import android.content.ComponentName; @@ -27,21 +33,17 @@ import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.content.pm.ServiceInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; import android.database.Cursor; import android.net.ConnectivityManager; import android.net.Uri; import android.os.Broadcaster; -import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.os.RemoteException; import android.provider.Im; -import android.text.TextUtils; import android.util.Log; import com.android.im.IConnectionCreationListener; @@ -53,16 +55,9 @@ import com.android.im.engine.ImConnection; import com.android.im.engine.ImErrorInfo; import com.android.im.plugin.BrandingResourceIDs; import com.android.im.plugin.ImPlugin; -import com.android.im.plugin.ImPluginConstants; import com.android.im.plugin.ImPluginInfo; import com.android.im.service.ImServiceConstants; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - public class ImApp extends Application { public static final String LOG_TAG = "ImApp"; diff --git a/src/com/android/im/app/ImPluginHelper.java b/src/com/android/im/app/ImPluginHelper.java index f557493..2af7633 100644 --- a/src/com/android/im/app/ImPluginHelper.java +++ b/src/com/android/im/app/ImPluginHelper.java @@ -251,7 +251,6 @@ public class ImPluginHelper { return providerId; } - @SuppressWarnings("unchecked") private Map<String, String> loadConfiguration(ImPlugin plugin, ImPluginInfo info) { Map<String, String> config = null; diff --git a/src/com/android/im/app/LandingPage.java b/src/com/android/im/app/LandingPage.java index cdbea1e..8020cd0 100644 --- a/src/com/android/im/app/LandingPage.java +++ b/src/com/android/im/app/LandingPage.java @@ -102,8 +102,8 @@ public class LandingPage extends ListActivity implements View.OnCreateContextMen mProviderCursor = managedQuery(Im.Provider.CONTENT_URI_WITH_ACCOUNT, PROVIDER_PROJECTION, - null /* selection */, - null /* selection args */, + Im.Provider.CATEGORY + "=?" /* selection */, + new String[]{ ImApp.IMPS_CATEGORY } /* selection args */, Im.Provider.DEFAULT_SORT_ORDER); mAdapter = new ProviderAdapter(this, mProviderCursor); setListAdapter(mAdapter); diff --git a/src/com/android/im/app/ProviderListItem.java b/src/com/android/im/app/ProviderListItem.java index 882a424..9ddc895 100644 --- a/src/com/android/im/app/ProviderListItem.java +++ b/src/com/android/im/app/ProviderListItem.java @@ -18,6 +18,7 @@ package com.android.im.app; import com.android.im.R; +import com.android.im.plugin.BrandingResourceIDs; import android.graphics.drawable.Drawable; import android.widget.LinearLayout; @@ -27,7 +28,6 @@ import android.content.Context; import android.content.ContentResolver; import android.content.res.Resources; import android.database.Cursor; -import android.im.BrandingResourceIDs; import android.content.res.ColorStateList; import android.view.View; import android.provider.Im; |