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

Commit 60256300 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I71e70d6f,I40955c6e,I70ed303b 

* changes:
  Bubble change when display size change.
  Update Assisted Dialing references.
  Pressing back button twice really quickly no longer crashes dialer.
parents 5feae4d9 bf7e8854

java/com/android/dialer/assisteddialing/ConcreteCreator.java

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.Build.VERSION_CODES; 
import android.preference.PreferenceManager;

import android.support.annotation.NonNull;

import android.support.annotation.VisibleForTesting;

import android.support.v4.os.BuildCompat;

import android.support.v4.os.UserManagerCompat;

import android.telephony.TelephonyManager;

import com.android.dialer.common.LogUtil;
@@ -102,7 +103,8 @@ public final class ConcreteCreator { 
    }



    return (Build.VERSION.SDK_INT >= BUILD_CODE_FLOOR

            && Build.VERSION.SDK_INT <= BUILD_CODE_CEILING)

            && Build.VERSION.SDK_INT <= BUILD_CODE_CEILING

            && !BuildCompat.isAtLeastP())

        && configProvider.getBoolean("assisted_dialing_enabled", false);

  }

java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java

+5 −2
Original line number Diff line number Diff line
@@ -65,8 +65,11 @@ public class TelephonyManagerCompat { 
  public static final String ASSISTED_DIALING_EXTRAS =

      "android.telecom.extra.ASSISTED_DIALING_EXTRAS";



  public static final String EXTRA_ASSISTED_DIALING_TRANSFORMATION_INFO =

      "android.telecom.extra.ASSISTED_DIALING_TRANSFORMATION_INFO";



  /** Indicates the Connection/Call used assisted dialing. */

  public static final int PROPERTY_ASSISTED_DIALING_USED = 0x00000200;

  public static final int PROPERTY_ASSISTED_DIALING_USED = 1 << 9;



  public static final String EXTRA_IS_REFRESH =

      BuildCompat.isAtLeastOMR1() ? "android.telephony.extra.IS_REFRESH" : "is_refresh";
@@ -75,7 +78,7 @@ public class TelephonyManagerCompat { 
   * Indicates the call underwent Assisted Dialing; typically set as a feature available from the

   * CallLog.

   */

  public static final Integer FEATURES_ASSISTED_DIALING = 0x10;

  public static final Integer FEATURES_ASSISTED_DIALING = 1 << 4;



  /**

   * Returns the number of phones available. Returns 1 for Single standby mode (Single SIM

java/com/android/dialer/main/impl/toolbar/SearchBarView.java

+4 −0
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ final class SearchBarView extends FrameLayout { 
  }



  private void onSearchBackButtonClicked() {

    if (!isExpanded) {

      return;

    }



    listener.onSearchBackButtonClicked();

    collapse(true);

  }

java/com/android/incallui/call/DialerCall.java

+17 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa 
    // perform assisted dialing. PROPERTY_ASSISTED_DIALING_USED indicates assisted dialing took

    // place.

    if (hasProperty(TelephonyManagerCompat.PROPERTY_ASSISTED_DIALING_USED)

        && Build.VERSION.SDK_INT > ConcreteCreator.BUILD_CODE_CEILING) {

        && BuildCompat.isAtLeastP()) {

      return true;

    }

    return false;
@@ -1126,10 +1126,26 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa 
      return null;

    }



    if (BuildCompat.isAtLeastP()) {

      if (getExtras() == null) {

        return null;

      }



      if (getExtras()

              .getParcelable(TelephonyManagerCompat.EXTRA_ASSISTED_DIALING_TRANSFORMATION_INFO)

          == null) {

        return null;

      }



      // TODO(erfanian): Use the framework transformation info when we can link against it

      return null;

    }



    if (getIntentExtras().getBundle(TelephonyManagerCompat.ASSISTED_DIALING_EXTRAS) == null) {

      return null;

    }



    // Used in N-OMR1

    return TransformationInfo.newInstanceFromBundle(

        getIntentExtras().getBundle(TelephonyManagerCompat.ASSISTED_DIALING_EXTRAS));

  }

java/com/android/newbubble/NewBubble.java

+21 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.annotation.SuppressLint; 
import android.app.PendingIntent.CanceledException;

import android.content.Context;

import android.content.Intent;

import android.graphics.Outline;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.graphics.drawable.Animatable;
@@ -46,6 +47,7 @@ import android.view.MotionEvent; 
import android.view.View;

import android.view.View.AccessibilityDelegate;

import android.view.ViewGroup;

import android.view.ViewOutlineProvider;

import android.view.ViewTreeObserver.OnPreDrawListener;

import android.view.WindowManager;

import android.view.WindowManager.LayoutParams;
@@ -112,7 +114,7 @@ public class NewBubble { 
  @VisibleForTesting AnimatorSet exitAnimatorSet;

  @VisibleForTesting AnimatorSet enterAnimatorSet;



  private final int primaryIconMoveDistance;

  private int primaryIconMoveDistance;

  private final int leftBoundary;

  private int savedYPosition = -1;
@@ -663,6 +665,22 @@ public class NewBubble { 
  }



  private void update() {

    // The value may change on display size changed.

    primaryIconMoveDistance =

        context.getResources().getDimensionPixelSize(R.dimen.bubble_size)

            - context.getResources().getDimensionPixelSize(R.dimen.bubble_small_icon_size);

    // Set boundary for primary button to show elevation (background is transparent)

    viewHolder

        .getPrimaryButton()

        .setOutlineProvider(

            new ViewOutlineProvider() {

              @Override

              public void getOutline(View view, Outline outline) {

                ViewOutlineProvider.BACKGROUND.getOutline(view, outline);

                outline.setAlpha(1);

              }

            });



    // Small icon

    Drawable smallIconBackgroundCircle =

        context
@@ -914,9 +932,10 @@ public class NewBubble { 
              startCollapse(CollapseEnd.NOTHING, false /* shouldRecoverYPosition */);

            }

            // The values in the current MoveHandler may be stale, so replace it. Then ensure the

            // Window is in bounds

            // Window is in bounds, and redraw the changes

            moveHandler = new NewMoveHandler(primaryButton, NewBubble.this);

            moveHandler.snapToBounds();

            replaceViewHolder();

          });

      root.setOnTouchListener(

          (v, event) -> {