Move HIDE_VOICEMAIL_SETTINGS_MENU out of voicemail/impl
The metadata belongs with the voicemail settings menu, which is moved into dialer a while ago. Not moving the metadata causes build variants without VVM to have duplicated voicemail settings in telephony and dialer.
Also removed the redundant metadata in incall ui manifest.
Bug: 73096806
Test: manual
PiperOrigin-RevId: 188756468
Change-Id: I00174f84024c5b9ab809d99e40a55d22a07bd063
diff --git a/java/com/android/dialer/voicemail/settings/AndroidManifest.xml b/java/com/android/dialer/voicemail/settings/AndroidManifest.xml
index 4a0784f..5b7f1f7 100644
--- a/java/com/android/dialer/voicemail/settings/AndroidManifest.xml
+++ b/java/com/android/dialer/voicemail/settings/AndroidManifest.xml
@@ -18,6 +18,11 @@
package="com.android.dialer.voicemail.settings">
<application>
+ <!-- Causes the "Voicemail" item under "Calls" setting to be hidden. The voicemail module will
+ be handling the settings. Has no effect before OC where dialer cannot provide voicemail
+ settings-->
+ <meta-data android:name="android.telephony.HIDE_VOICEMAIL_SETTINGS_MENU" android:value="true"/>
+
<activity
android:exported="false"
android:label="@string/voicemail_change_pin_preference_title"
diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml
index 1b5f099..2417797 100644
--- a/java/com/android/incallui/AndroidManifest.xml
+++ b/java/com/android/incallui/AndroidManifest.xml
@@ -46,10 +46,6 @@
Set taskAffinity for application is not working because it will be merged and the result is
that all activities here still have same taskAffinity as activities under dialer. -->
<application>
- <meta-data
- android:name="android.telephony.hide_voicemail_settings_menu"
- android:value="true"/>
-
<!-- Go variants need hardware acceleration for IMS video calls even though it is disabled at
the application level -->
<activity
diff --git a/java/com/android/voicemail/impl/AndroidManifest.xml b/java/com/android/voicemail/impl/AndroidManifest.xml
index 1998d35..3a2bfcb 100644
--- a/java/com/android/voicemail/impl/AndroidManifest.xml
+++ b/java/com/android/voicemail/impl/AndroidManifest.xml
@@ -19,10 +19,6 @@
<application
android:supportsRtl="true">
- <!-- Causes the "Voicemail" item under "Calls" setting to be hidden. The voicemail module will
- be handling the settings. Has no effect before OC where dialer cannot provide voicemail
- settings-->
- <meta-data android:name="android.telephony.HIDE_VOICEMAIL_SETTINGS_MENU" android:value="true"/>
<receiver
android:name="com.android.voicemail.impl.sms.OmtpMessageReceiver"