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

Commit b9c4655a authored by calderwoodra's avatar calderwoodra Committed by android-build-merger
Browse files

Merge changes I27b0f911,I495e326c 

am: b548b970

Change-Id: I30517275572a722457f624383923c8d06f485fb9
parents 416d1cd7 b548b970

java/com/android/dialer/main/impl/bottomnav/res/drawable/notification_badge.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

  <solid android:color="@color/dialer_theme_color"/>

  <corners android:radius="18dp"/>

  <corners android:radius="20dp"/>

  <stroke android:color="@color/background_dialer_white" android:width="2dp"/>

</shape>
 
 No newline at end of file

java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml

+4 −2
Original line number Diff line number Diff line
@@ -32,17 +32,19 @@ 
        android:id="@+id/bottom_nav_item_image"

        android:layout_width="24dp"

        android:layout_height="24dp"

        android:layout_marginTop="4dp"/>

        android:layout_marginTop="8dp"/>



    <TextView

        android:id="@+id/notification_badge"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="top|end"

        android:layout_marginTop="2dp"

        android:paddingStart="6dp"

        android:paddingEnd="6dp"

        android:paddingBottom="1dp"

        android:minHeight="20dp"

        android:minWidth="18dp"

        android:minWidth="20dp"

        android:gravity="center"

        android:textSize="12sp"

        android:textColor="@color/dialer_primary_text_color_white"

java/com/android/dialer/searchfragment/directories/DirectoryContactViewHolder.java

+7 −5
Original line number Diff line number Diff line
@@ -29,15 +29,13 @@ import android.view.View; 
import android.widget.ImageView;

import android.widget.QuickContactBadge;

import android.widget.TextView;

import com.android.dialer.callintent.CallInitiationType;

import com.android.dialer.callintent.CallIntentBuilder;

import com.android.dialer.common.cp2.DirectoryCompat;

import com.android.dialer.contactphoto.ContactPhotoManager;

import com.android.dialer.lettertile.LetterTileDrawable;

import com.android.dialer.precall.PreCall;

import com.android.dialer.searchfragment.common.Projections;

import com.android.dialer.searchfragment.common.QueryBoldingUtil;

import com.android.dialer.searchfragment.common.R;

import com.android.dialer.searchfragment.common.RowClickListener;

import com.android.dialer.searchfragment.common.SearchCursor;



/** ViewHolder for a directory contact row. */
@@ -49,10 +47,12 @@ public final class DirectoryContactViewHolder extends RecyclerView.ViewHolder 
  private final TextView numberView;

  private final QuickContactBadge photo;

  private final ImageView workBadge;

  private final RowClickListener listener;



  private String number;

  private int position;



  public DirectoryContactViewHolder(View view) {

  public DirectoryContactViewHolder(View view, RowClickListener listener) {

    super(view);

    view.setOnClickListener(this);

    photo = view.findViewById(R.id.photo);
@@ -60,6 +60,7 @@ public final class DirectoryContactViewHolder extends RecyclerView.ViewHolder 
    numberView = view.findViewById(R.id.secondary);

    workBadge = view.findViewById(R.id.work_icon);

    context = view.getContext();

    this.listener = listener;

  }



  /**
@@ -68,6 +69,7 @@ public final class DirectoryContactViewHolder extends RecyclerView.ViewHolder 
   */

  public void bind(SearchCursor cursor, String query) {

    number = cursor.getString(Projections.PHONE_NUMBER);

    position = cursor.getPosition();

    String name = cursor.getString(Projections.DISPLAY_NAME);

    String label = getLabel(context.getResources(), cursor);

    String secondaryInfo =
@@ -139,6 +141,6 @@ public final class DirectoryContactViewHolder extends RecyclerView.ViewHolder 


  @Override

  public void onClick(View v) {

    PreCall.start(context, new CallIntentBuilder(number, CallInitiationType.Type.REGULAR_SEARCH));

    listener.placeVoiceCall(number, position);

  }

}

java/com/android/dialer/searchfragment/list/NewSearchFragment.java

+5 −6
Original line number Diff line number Diff line
@@ -509,28 +509,27 @@ public final class NewSearchFragment extends Fragment 


  @Override

  public void placeVoiceCall(String phoneNumber, int ranking) {

    placeCall(phoneNumber, ranking, false, true);

    placeCall(phoneNumber, ranking, false);

  }



  @Override

  public void placeVideoCall(String phoneNumber, int ranking) {

    placeCall(phoneNumber, ranking, true, false);

    placeCall(phoneNumber, ranking, true);

  }



  private void placeCall(

      String phoneNumber, int position, boolean isVideoCall, boolean allowAssistedDial) {

  private void placeCall(String phoneNumber, int position, boolean isVideoCall) {

    CallSpecificAppData callSpecificAppData =

        CallSpecificAppData.newBuilder()

            .setCallInitiationType(callInitiationType)

            .setPositionOfSelectedSearchResult(position)

            .setCharactersInSearchString(query == null ? 0 : query.length())

            .setAllowAssistedDialing(allowAssistedDial)

            .setAllowAssistedDialing(true)

            .build();

    PreCall.start(

        getContext(),

        new CallIntentBuilder(phoneNumber, callSpecificAppData)

            .setIsVideoCall(isVideoCall)

            .setAllowAssistedDial(allowAssistedDial));

            .setAllowAssistedDial(true));

    FragmentUtils.getParentUnsafe(this, SearchFragmentListener.class).onCallPlacedFromSearch();

  }

java/com/android/dialer/searchfragment/list/SearchAdapter.java

+4 −2
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ public final class SearchAdapter extends RecyclerView.Adapter<ViewHolder> { 
            rowClickListener);

      case RowType.NEARBY_PLACES_ROW:

        return new NearbyPlaceViewHolder(

            LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false));

            LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false),

            rowClickListener);

      case RowType.CONTACT_HEADER:

      case RowType.DIRECTORY_HEADER:

      case RowType.NEARBY_PLACES_HEADER:
@@ -78,7 +79,8 @@ public final class SearchAdapter extends RecyclerView.Adapter<ViewHolder> { 
            LayoutInflater.from(context).inflate(R.layout.header_layout, root, false));

      case RowType.DIRECTORY_ROW:

        return new DirectoryContactViewHolder(

            LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false));

            LayoutInflater.from(context).inflate(R.layout.search_contact_row, root, false),

            rowClickListener);

      case RowType.SEARCH_ACTION:

        return new SearchActionViewHolder(

            LayoutInflater.from(context).inflate(R.layout.search_action_layout, root, false));