summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorSantos Cordon <santoscordon@google.com>2015-05-04 13:05:30 -0700
committerSantos Cordon <santoscordon@google.com>2015-05-18 12:54:46 -0700
commit55344342de211db4c99d57ddfc550864d9113376 (patch)
tree47cb349ccff1f437363df0a0c674fa05317a38bc /AndroidManifest.xml
parentebf2d0f2b4f17e958b0b23d94edc6b0d05334e43 (diff)
downloadplatform_packages_services_Telecomm-55344342de211db4c99d57ddfc550864d9113376.tar.gz
platform_packages_services_Telecomm-55344342de211db4c99d57ddfc550864d9113376.tar.bz2
platform_packages_services_Telecomm-55344342de211db4c99d57ddfc550864d9113376.zip
Add a setting to enable/disable calling accounts.
Bug: 20303449 Change-Id: I34f9e5a572fd449ad617861576937f9648ae4ee9
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 554762433..34647a201 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -216,6 +216,17 @@
</intent-filter>
</activity>
+ <activity android:name=".settings.EnableAccountPreferenceActivity"
+ android:label="@string/enable_account_preference_title"
+ android:configChanges="orientation|screenSize|keyboardHidden"
+ android:theme="@style/Theme.Telecom.DialerSettings"
+ android:process=":ui">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<activity android:name=".components.ErrorDialogActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:excludeFromRecents="true"