diff options
| author | Flavio Lerda <flerda@google.com> | 2011-10-18 16:04:09 +0100 |
|---|---|---|
| committer | Flavio Lerda <flerda@google.com> | 2011-10-21 14:41:18 +0100 |
| commit | 1c6f3817e9e889664d143ed5ea5147aca595dd21 (patch) | |
| tree | 4fd24406461f0465da3ad2d3e8fef313e447ff3d /AndroidManifest.xml | |
| parent | c1313a5fafa7df42dd3712ac003730ea164a073b (diff) | |
| download | packages_apps_Contacts-1c6f3817e9e889664d143ed5ea5147aca595dd21.tar.gz packages_apps_Contacts-1c6f3817e9e889664d143ed5ea5147aca595dd21.tar.bz2 packages_apps_Contacts-1c6f3817e9e889664d143ed5ea5147aca595dd21.zip | |
Remove CallLogActivity.
CallLogActivity was only used by tests. Instead, extend
FragmentTestActivity to handle loading of an arbitrary fragment into it,
so that we can test the CallLogFragment within it.
So far, FragmentTestActivity was only used with a UI-less fragment,
which therefore did not need a placeholder for the fragment.
Bug: 5286366
Change-Id: I939d6fb212621345b8a1ba4ec1a3b1c56909ce50
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 520e14c08..2877820a0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -56,19 +56,6 @@ android:hardwareAccelerated="true" > - <!-- A list of recent calls --> - <activity android:name=".activities.CallLogActivity" - android:label="@string/recentCallsIconLabel" - android:theme="@style/DialtactsTheme" - android:uiOptions="splitActionBarWhenNarrow" - > - <intent-filter> - <action android:name="com.android.phone.action.RECENT_CALLS" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.TAB" /> - </intent-filter> - </activity> - <!-- Intercept Dialer Intents for devices without a phone. This activity should have the same intent filters as the DialtactsActivity, so that its capturing the same events. Omit android.intent.category.LAUNCHER, because we @@ -182,6 +169,11 @@ <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.TAB" /> </intent-filter> + <intent-filter android:label="@string/recentCallsIconLabel"> + <action android:name="com.android.phone.action.RECENT_CALLS" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.TAB" /> + </intent-filter> </activity> <!-- The main Contacts activity with the contact list, favorites, and groups. --> @@ -330,6 +322,18 @@ android:exported="true" /> + <!-- Backwards compatibility: "Call log" from Gingerbread and earlier --> + <activity-alias android:name="RecentCallsListActivity" + android:targetActivity=".activities.DialtactsActivity" + android:exported="true" + /> + + <!-- Backwards compatibility: "Call log" from ICS --> + <activity-alias android:name=".activities.CallLogActivity" + android:targetActivity=".activities.DialtactsActivity" + android:exported="true" + /> + <!-- An activity for joining contacts --> <activity android:name=".activities.JoinContactActivity" android:theme="@style/JoinContactActivityTheme" |