commit aa18e9ccc288f4f03025fd4244dde45b2cae7f85
author Nancy Chen <nancychen@google.com> Fri Sep 05 11:07:15 2014 -0700
committer Nancy Chen <nancychen@google.com> Fri Sep 05 11:35:46 2014 -0700
tree 1eadeecd30820e770ab7818a67cd97d95882c8e0
parent ceded0401f95ae2895ad4278395f58e2c208d977

Rename listener to callback for ConferenceManager and rename strings 3/4

Updates for items from API review. See bug for details.

Bug: 17390175
Change-Id: I9de8402d2dc3d6f81652b20b0606fffdd9886fb9

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ed4e910..f668255 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -429,8 +429,8 @@
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.telecomm.intent.action.SHOW_CALL_SETTINGS" />
-                <action android:name="android.telecomm.intent.action.CHANGE_PHONE_ACCOUNTS" />
+                <action android:name="android.telecomm.action.SHOW_CALL_SETTINGS" />
+                <action android:name="android.telecomm.action.CHANGE_PHONE_ACCOUNTS" />
                 <action android:name="com.android.phone.CallFeaturesSetting.ADD_VOICEMAIL" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>