From 1800fa44648e42f17ad73fe7dde4bc474f48609c Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Mon, 12 Mar 2018 11:57:11 -0700
Subject: 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
---
 java/com/android/dialer/voicemail/settings/AndroidManifest.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'java/com/android/dialer')

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"
-- 
cgit v1.2.3


From ffdea5488e003ede58a01967a01ccd70e16b33af Mon Sep 17 00:00:00 2001
From: uabdullah <uabdullah@google.com>
Date: Mon, 12 Mar 2018 11:59:15 -0700
Subject: Make NUI VM avatar and icon consistent with nui call log

Makes the avatar and more icon the same as the nui call log.

Bug: 69963448
Test: N/A
PiperOrigin-RevId: 188756733
Change-Id: I93303a2a872ac156470d223d6fb4fd2959766adc
---
 .../voicemail/listui/res/layout/new_voicemail_entry.xml     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'java/com/android/dialer')

diff --git a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
index c6e5938c7..c948ca17b 100644
--- a/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
+++ b/java/com/android/dialer/voicemail/listui/res/layout/new_voicemail_entry.xml
@@ -25,7 +25,7 @@
       android:id="@+id/quick_contact_photo"
       android:layout_width="40dp"
       android:layout_height="40dp"
-      android:layout_marginTop="14dp"
+      android:layout_marginTop="16dp"
       android:layout_marginStart="16dp"
       android:layout_marginEnd="16dp"
       android:focusable="true"/>
@@ -101,12 +101,17 @@
 
   </LinearLayout>
 
-  <!-- TODO(a bug): Add ripple effect -->
   <ImageView
       android:id="@+id/menu_button"
-      android:layout_width="@dimen/call_log_entry_menu_button_size"
-      android:layout_height="@dimen/call_log_entry_menu_button_size"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="12dp"
+      android:layout_marginBottom="12dp"
+      android:layout_marginStart="4dp"
+      android:layout_marginEnd="4dp"
       android:layout_alignParentEnd="true"
+      android:padding="12dp"
+      android:background="?android:attr/selectableItemBackgroundBorderless"
       android:scaleType="center"
       android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
       android:tint="@color/dialer_secondary_text_color"/>
-- 
cgit v1.2.3