diff options
author | Yorke Lee <yorkelee@google.com> | 2014-07-16 00:06:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-15 16:05:07 +0000 |
commit | a5b475bbc4a0a41c3d0d8fc31b955e1fd96b1c9f (patch) | |
tree | adeffa3f76467b51a8ec3040327245910e14c2b8 /AndroidManifest.xml | |
parent | 9072432dbf1d46aaeed2c02f48af925b393457bb (diff) | |
parent | af6f195af0bb200d1bb06ad11dac476e8dff0073 (diff) | |
download | android_packages_apps_Dialer-a5b475bbc4a0a41c3d0d8fc31b955e1fd96b1c9f.tar.gz android_packages_apps_Dialer-a5b475bbc4a0a41c3d0d8fc31b955e1fd96b1c9f.tar.bz2 android_packages_apps_Dialer-a5b475bbc4a0a41c3d0d8fc31b955e1fd96b1c9f.zip |
Merge "Make ContactPreferences use SharedPreferences instead of System settings (5/5)" into lmp-dev
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3fb4c4398..03b349f69 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -122,6 +122,13 @@ </intent-filter> </activity> + <activity android:name="com.android.dialer.settings.DialerSettingsActivity" + android:label="@string/dialer_settings_label" + android:parentActivityName="com.android.dialer.DialtactsActivity" + android:theme="@style/SettingsStyle" + android:exported="false"> + </activity> + <activity android:name="com.android.dialer.calllog.CallLogActivity" android:label="@string/call_log_activity_title" android:theme="@style/DialtactsThemeWithoutActionBarOverlay" |