summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2015-11-17 23:07:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-17 23:07:03 +0000
commit5b8f25a8f175b8f003c91b539da297fb62bfdbc8 (patch)
tree842fb58cdb07ab4a6a10ce181a1682b63e0e0d32
parentcdf6e3bc2a710ee9be80198e36f944e2eb922793 (diff)
parent7064f0a8e2a31b4cb574742b9c1acf40f7aeb9e7 (diff)
Remove use of framework resource in configs am: 6e826d7da9
am: 7064f0a8e2 * commit '7064f0a8e2a31b4cb574742b9c1acf40f7aeb9e7': Remove use of framework resource in configs
-rw-r--r--AndroidManifest.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index de78e626f..7565aee2f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -81,7 +81,6 @@
android:launchMode="singleTask"
android:clearTaskOnLaunch="true"
android:icon="@mipmap/ic_launcher_phone"
- android:enabled="@*android:bool/config_voice_capable"
android:windowSoftInputMode="stateAlwaysHidden|adjustNothing">
<intent-filter>
<action android:name="android.intent.action.DIAL" />
@@ -247,8 +246,7 @@
android:exported="false"/>
<!-- end vCard related -->
- <receiver android:name=".calllog.CallLogReceiver"
- android:enabled="@*android:bool/config_voice_capable">
+ <receiver android:name=".calllog.CallLogReceiver">
<intent-filter>
<action android:name="android.intent.action.NEW_VOICEMAIL" />
<data