Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a5fa3648: Merge change 22383 into eclair

Browse Source 
Merge commit 'a5fa36481cdbe2cd324055d9f508e492482cb7dc' into eclair-plus-aosp

* commit 'a5fa36481cdbe2cd324055d9f508e492482cb7dc':
  Remove the decleration of com.android.im.plugin.jar in platform.xml
This commit is contained in:
Scott Su
2009-08-22 11:09:33 -07:00
committed by Android Git Automerger
parent a3598d9acd a5fa36481c
commit 9d11ef2b4a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/provider/Im.java
View File

@@ -138,6 +138,7 @@ public class Im {
public static final String ACTIVE_ACCOUNT_USERNAME = "account_username"; public static final String ACTIVE_ACCOUNT_USERNAME = "account_username";
public static final String ACTIVE_ACCOUNT_PW = "account_pw"; public static final String ACTIVE_ACCOUNT_PW = "account_pw";
public static final String ACTIVE_ACCOUNT_LOCKED = "account_locked"; public static final String ACTIVE_ACCOUNT_LOCKED = "account_locked";
public static final String ACTIVE_ACCOUNT_KEEP_SIGNED_IN = "account_keepSignedIn";
public static final String ACCOUNT_PRESENCE_STATUS = "account_presenceStatus"; public static final String ACCOUNT_PRESENCE_STATUS = "account_presenceStatus";
public static final String ACCOUNT_CONNECTION_STATUS = "account_connStatus"; public static final String ACCOUNT_CONNECTION_STATUS = "account_connStatus";
@@ -1467,7 +1468,7 @@ public class Im {
* <P>Type: TEXT</P> * <P>Type: TEXT</P>
*/ */
String UNSENT_COMPOSED_MESSAGE = "unsent_composed_message"; String UNSENT_COMPOSED_MESSAGE = "unsent_composed_message";
/** /**
* A value from 0-9 indicating which quick-switch chat screen slot this * A value from 0-9 indicating which quick-switch chat screen slot this
* chat is occupying. If none (for instance, this is the 12th active chat) * chat is occupying. If none (for instance, this is the 12th active chat)

2
data/etc/platform.xml
View File

@@ -146,8 +146,6 @@
<library name="android.test.runner" <library name="android.test.runner"
file="/system/framework/android.test.runner.jar" /> file="/system/framework/android.test.runner.jar" />
<library name="com.android.im.plugin"
file="/system/framework/com.android.im.plugin.jar"/>
<library name="javax.obex" <library name="javax.obex"
file="/system/framework/javax.obex.jar"/> file="/system/framework/javax.obex.jar"/>