diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-12 20:20:17 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-12 20:20:17 +0000 |
commit | b3b46da60812782c9bf35e3895e4081ce54ba349 (patch) | |
tree | a657f6bc23e1dfb7d4f0af251b1c47439b489f91 /java/com | |
parent | d5514615336a16a83b885c4c18bcbcddccdf9407 (diff) | |
parent | ffdea5488e003ede58a01967a01ccd70e16b33af (diff) |
Merge changes I93303a2a,I00174f84
* changes:
Make NUI VM avatar and icon consistent with nui call log
Move HIDE_VOICEMAIL_SETTINGS_MENU out of voicemail/impl
Diffstat (limited to 'java/com')
4 files changed, 14 insertions, 12 deletions
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"/> 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" |