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

Commit dc43edb6 authored by wangqi's avatar wangqi Committed by android-build-merger
Browse files

Merge changes I9ecd36ce,I917bac76 am: e9e0335d 

am: ab75ef3d

Change-Id: I27dd1bd1d2e0e21a4cb9d8092646ce4f6410dec1
parents be10434d ab75ef3d

assets/quantum/res/drawable/quantum_ic_bluetooth_audio_vd_theme_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@android:color/white"

      android:pathData="M14.24,12.01l2.32,2.32c0.28,-0.72 0.44,-1.51 0.44,-2.33 0,-0.82 -0.16,-1.59 -0.43,-2.31l-2.33,2.32zM19.53,6.71l-1.26,1.26c0.63,1.21 0.98,2.57 0.98,4.02s-0.36,2.82 -0.98,4.02l1.2,1.2c0.97,-1.54 1.54,-3.36 1.54,-5.31 -0.01,-1.89 -0.55,-3.67 -1.48,-5.19zM15.71,7.71L10,2L9,2v7.59L4.41,5 3,6.41 8.59,12 3,17.59 4.41,19 9,14.41L9,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM11,5.83l1.88,1.88L11,9.59L11,5.83zM12.88,16.29L11,18.17v-3.76l1.88,1.88z"/>

</vector>

assets/quantum/res/drawable/quantum_ic_headset_vd_theme_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@android:color/white"

      android:pathData="M12,1c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7c0,-4.97 -4.03,-9 -9,-9z"/>

</vector>

assets/quantum/res/drawable/quantum_ic_phone_in_talk_vd_theme_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@android:color/white"

      android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.59l2.2,-2.21c0.28,-0.26 0.36,-0.65 0.25,-1C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM19,12h2c0,-4.97 -4.03,-9 -9,-9v2c3.87,0 7,3.13 7,7zM15,12h2c0,-2.76 -2.24,-5 -5,-5v2c1.66,0 3,1.34 3,3z"/>

</vector>

java/com/android/dialer/calldetails/CallDetailsActivity.java

+11 −8
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import com.android.dialer.calldetails.CallDetailsFooterViewHolder.ReportCallIdLi 
import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener;

import com.android.dialer.calllog.database.contract.AnnotatedCallLogContract.AnnotatedCallLog;

import com.android.dialer.common.Assert;

import com.android.dialer.dialercontact.DialerContact;

import com.android.dialer.enrichedcall.EnrichedCallComponent;

import com.android.dialer.protos.ProtoParsers;
@@ -42,26 +41,27 @@ import com.android.dialer.protos.ProtoParsers; 
 */

public final class CallDetailsActivity extends CallDetailsActivityCommon {

  public static final String EXTRA_COALESCED_CALL_LOG_IDS = "coalesced_call_log_ids";

  public static final String EXTRA_CONTACT = "contact";

  public static final String EXTRA_HEADER_INFO = "header_info";



  private static final int CALL_DETAILS_LOADER_ID = 0;



  /** IDs of call log entries, used to retrieve them from the annotated call log. */

  private CoalescedIds coalescedCallLogIds;



  private DialerContact contact;

  /** Info to be shown in the header. */

  private CallDetailsHeaderInfo headerInfo;



  /** Returns an {@link Intent} to launch this activity. */

  public static Intent newInstance(

      Context context,

      CoalescedIds coalescedAnnotatedCallLogIds,

      DialerContact contact,

      CallDetailsHeaderInfo callDetailsHeaderInfo,

      boolean canReportCallerId,

      boolean canSupportAssistedDialing) {

    Intent intent = new Intent(context, CallDetailsActivity.class);

    ProtoParsers.put(intent, EXTRA_CONTACT, Assert.isNotNull(contact));

    ProtoParsers.put(

        intent, EXTRA_COALESCED_CALL_LOG_IDS, Assert.isNotNull(coalescedAnnotatedCallLogIds));

    ProtoParsers.put(intent, EXTRA_HEADER_INFO, Assert.isNotNull(callDetailsHeaderInfo));

    intent.putExtra(EXTRA_CAN_REPORT_CALLER_ID, canReportCallerId);

    intent.putExtra(EXTRA_CAN_SUPPORT_ASSISTED_DIALING, canSupportAssistedDialing);

    return intent;
@@ -70,14 +70,17 @@ public final class CallDetailsActivity extends CallDetailsActivityCommon { 
  @Override

  protected void handleIntent(Intent intent) {

    Assert.checkArgument(intent.hasExtra(EXTRA_COALESCED_CALL_LOG_IDS));

    Assert.checkArgument(intent.hasExtra(EXTRA_HEADER_INFO));

    Assert.checkArgument(intent.hasExtra(EXTRA_CAN_REPORT_CALLER_ID));

    Assert.checkArgument(intent.hasExtra(EXTRA_CAN_SUPPORT_ASSISTED_DIALING));



    contact = ProtoParsers.getTrusted(intent, EXTRA_CONTACT, DialerContact.getDefaultInstance());

    setCallDetailsEntries(CallDetailsEntries.getDefaultInstance());

    coalescedCallLogIds =

        ProtoParsers.getTrusted(

            intent, EXTRA_COALESCED_CALL_LOG_IDS, CoalescedIds.getDefaultInstance());

    headerInfo =

        ProtoParsers.getTrusted(

            intent, EXTRA_HEADER_INFO, CallDetailsHeaderInfo.getDefaultInstance());



    getLoaderManager()

        .initLoader(
@@ -91,7 +94,7 @@ public final class CallDetailsActivity extends CallDetailsActivityCommon { 
      DeleteCallDetailsListener deleteCallDetailsListener) {

    return new CallDetailsAdapter(

        this,

        contact,

        headerInfo,

        getCallDetailsEntries(),

        callDetailsHeaderListener,

        reportCallIdListener,
@@ -100,7 +103,7 @@ public final class CallDetailsActivity extends CallDetailsActivityCommon { 


  @Override

  protected String getNumber() {

    return contact.getNumber();

    return headerInfo.getDialerPhoneNumber().getNormalizedNumber();

  }



  /**

java/com/android/dialer/calldetails/CallDetailsAdapter.java

+11 −7
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


package com.android.dialer.calldetails;





import android.content.Context;

import android.support.v7.widget.RecyclerView;

import android.view.View;

import com.android.dialer.calldetails.CallDetailsFooterViewHolder.DeleteCallDetailsListener;

import com.android.dialer.calldetails.CallDetailsHeaderViewHolder.CallDetailsHeaderListener;

import com.android.dialer.dialercontact.DialerContact;



/**

 * A {@link RecyclerView.Adapter} for {@link CallDetailsActivity}.
@@ -31,11 +31,12 @@ import com.android.dialer.dialercontact.DialerContact; 
 */

final class CallDetailsAdapter extends CallDetailsAdapterCommon {



  private final DialerContact contact;

  /** Info to be shown in the header. */

  private final CallDetailsHeaderInfo headerInfo;



  CallDetailsAdapter(

      Context context,

      DialerContact contact,

      CallDetailsHeaderInfo calldetailsHeaderInfo,

      CallDetailsEntries callDetailsEntries,

      CallDetailsHeaderListener callDetailsHeaderListener,

      CallDetailsFooterViewHolder.ReportCallIdListener reportCallIdListener,
@@ -46,26 +47,29 @@ final class CallDetailsAdapter extends CallDetailsAdapterCommon { 
        callDetailsHeaderListener,

        reportCallIdListener,

        deleteCallDetailsListener);

    this.contact = contact;

    this.headerInfo = calldetailsHeaderInfo;

  }



  @Override

  protected CallDetailsHeaderViewHolder createCallDetailsHeaderViewHolder(

      View container, CallDetailsHeaderListener callDetailsHeaderListener) {

    return new CallDetailsHeaderViewHolder(

        container, contact.getNumber(), contact.getPostDialDigits(), callDetailsHeaderListener);

        container,

        headerInfo.getDialerPhoneNumber().getNormalizedNumber(),

        headerInfo.getDialerPhoneNumber().getPostDialPortion(),

        callDetailsHeaderListener);

  }



  @Override

  protected void bindCallDetailsHeaderViewHolder(

      CallDetailsHeaderViewHolder callDetailsHeaderViewHolder, int position) {

    callDetailsHeaderViewHolder.updateContactInfo(contact, getCallbackAction());

    callDetailsHeaderViewHolder.updateContactInfo(headerInfo, getCallbackAction());

    callDetailsHeaderViewHolder.updateAssistedDialingInfo(

        getCallDetailsEntries().getEntries(position));

  }



  @Override

  protected String getNumber() {

    return contact.getNumber();

    return headerInfo.getDialerPhoneNumber().getNormalizedNumber();

  }

}