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

Commit db4d774e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4751292 from ce4299c3 to qt-release 

Change-Id: I7ca43d6b0bc2dd8e2c708f2f45c593931efc14e8
parents a61c9f0e ce4299c3

assets/quantum/res/drawable/quantum_ic_question_answer_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="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z"/>

</vector>

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

+22 −5
Original line number Diff line number Diff line
@@ -206,11 +206,28 @@ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClic 
  }



  private void showSpamBlockingPromoDialog() {

    if (spamBlockingPromoHelper.shouldShowSpamBlockingPromo()) {

    if (!spamBlockingPromoHelper.shouldShowSpamBlockingPromo()) {

      return;

    }



    Logger.get(context).logImpression(DialerImpression.Type.SPAM_BLOCKING_CALL_LOG_PROMO_SHOWN);

    spamBlockingPromoHelper.showSpamBlockingPromoDialog(

        fragmentManager,

          success -> spamBlockingPromoHelper.showModifySettingOnCompleteSnackbar(rootView, success),

          null /* onDissmissListener */);

        () -> {

          Logger.get(context)

              .logImpression(DialerImpression.Type.SPAM_BLOCKING_ENABLED_THROUGH_CALL_LOG_PROMO);

          spamSettings.modifySpamBlockingSetting(

              true,

              success -> {

                if (!success) {

                  Logger.get(context)

                      .logImpression(

                          DialerImpression.Type

                              .SPAM_BLOCKING_MODIFY_FAILURE_THROUGH_CALL_LOG_PROMO);

                }

                spamBlockingPromoHelper.showModifySettingOnCompleteSnackbar(rootView, success);

              });

        },

        null /* onDismissListener */);

  }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ public class CallLogFragment extends Fragment 
    super.onStart();

    CequintCallerIdManager cequintCallerIdManager = null;

    if (CequintCallerIdManager.isCequintCallerIdEnabled(getContext())) {

      cequintCallerIdManager = CequintCallerIdManager.createInstanceForCallLog();

      cequintCallerIdManager = new CequintCallerIdManager();

    }

    contactInfoCache.setCequintCallerIdManager(cequintCallerIdManager);

  }

java/com/android/dialer/callintent/CallIntentBuilder.java

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ public class CallIntentBuilder implements Parcelable { 
    return isVideoCall;

  }



  /** Default false. Should only be set to true if the number has a lookup URI. */

  public CallIntentBuilder setAllowAssistedDial(boolean allowAssistedDial) {

    this.allowAssistedDial = allowAssistedDial;

    return this;

java/com/android/dialer/calllog/database/contract/number_attributes.proto

+5 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ package com.android.dialer; 
import "java/com/android/dialer/logging/contact_source.proto";



// Information related to the phone number of the call.

// Next ID: 13

// Next ID: 14

message NumberAttributes {

  // The name (which may be a person's name or business name, but not a number)

  // formatted exactly as it should appear to the user. If the user's locale or
@@ -70,4 +70,8 @@ message NumberAttributes { 


  // Whether the number can be reached via a carrier video call.

  optional bool can_support_carrier_video_call = 12;



  // Description of the number's geolocation (e.g., "Mountain View, CA").

  // This string is for display purpose only.

  optional string geolocation = 13;

}
 
 No newline at end of file