diff options
| author | twyen <twyen@google.com> | 2018-03-12 11:57:11 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-03-12 12:11:11 -0700 |
| commit | 1800fa44648e42f17ad73fe7dde4bc474f48609c (patch) | |
| tree | 4e25def35828e35b46a99291fa2e93fe8d3cd889 /java | |
| parent | d5514615336a16a83b885c4c18bcbcddccdf9407 (diff) | |
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
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/dialer/voicemail/settings/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | java/com/android/incallui/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | java/com/android/voicemail/impl/AndroidManifest.xml | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/java/com/android/dialer/voicemail/settings/AndroidManifest.xml b/java/com/android/dialer/voicemail/settings/AndroidManifest.xml index 4a0784f84..5b7f1f79e 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 1b5f09973..24177979e 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 1998d35f6..3a2bfcb3b 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" |