Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3034a44 authored by linyuh's avatar linyuh Committed by android-build-merger
Browse files

Merge changes I0b267429,Icba3cb63,If2090c6d 

am: d96b1740

Change-Id: Ie616862f17c51cb54bc2ddd6352f1f7c958ab41c
parents 6a642ec1 d96b1740

java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.dialer.util.PermissionsUtil; 
import com.android.dialer.voicemail.listui.error.VoicemailErrorMessageCreator;

import com.android.dialer.voicemail.listui.error.VoicemailStatus;

import com.android.dialer.voicemail.listui.error.VoicemailStatusWorker;

import com.android.dialer.widget.EmptyContentView;

import java.util.List;



public class VisualVoicemailCallLogFragment extends CallLogFragment {
@@ -110,6 +111,9 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment { 
  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {

    View view = inflater.inflate(R.layout.call_log_fragment, container, false);

    setupView(view);

    EmptyContentView emptyContentView = view.findViewById(R.id.empty_list_view);

    emptyContentView.setImage(R.drawable.quantum_ic_voicemail_vd_theme_24);

    emptyContentView.setImageTint(R.color.empty_voicemail_icon_tint_color, null);

    return view;

  }

java/com/android/dialer/widget/res/drawable/item_background_material_light.xml→java/com/android/dialer/widget/res/drawable/ripple_material_light.xml

+2 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
  ~ limitations under the License

  -->



<!-- Based on the Theme.Material's default selectableItemBackground -->

<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="@color/dialer_ripple_material_light">

  <item android:id="@android:id/mask">

java/com/android/dialer/widget/res/layout/fragment_message.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
      android:textColor="@color/dialer_primary_text_color"

      android:textColorHint="@color/dialer_edit_text_hint_color"

      android:background="@color/background_dialer_white"

      android:textCursorDrawable="@drawable/searchedittext_custom_cursor"

      android:textCursorDrawable="@drawable/edittext_custom_cursor"

      android:layout_toStartOf="@+id/count_and_send_container"

      android:inputType="textShortMessage|textCapSentences"

      android:imeOptions="flagNoExtractUi|actionSend"/>

java/com/android/dialer/widget/res/layout/selectable_text_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ 
  android:textSize="16sp"

  android:textColor="@color/dialer_primary_text_color"

  android:padding="16dp"

  android:background="@drawable/item_background_material_light"/>
 
 No newline at end of file
 
  android:background="@drawable/ripple_material_light"/>
 
 No newline at end of file