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

Commit 352f089d authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: 237d9b01 am: 45595d47 am: 6b570f82 am: 67f41e0c am: 05e824b3

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1378558

Change-Id: Iac5cc419e476d7b037618dfa92803966b27bbbf8
parents 6ff0f6b9 05e824b3

java/com/android/dialer/app/list/PhoneFavoriteTileView.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { 
  // make room for the contact name and number label at the bottom of the image.

  private static final float DEFAULT_IMAGE_LETTER_OFFSET = -0.12f;

  private static final float DEFAULT_IMAGE_LETTER_SCALE = 0.70f;

  // Dummy clip data object that is attached to drag shadows so that text views

  // Placeholder clip data object that is attached to drag shadows so that text views

  // don't crash with an NPE if the drag shadow is released in their bounds

  private static final ClipData EMPTY_CLIP_DATA = ClipData.newPlainText("", "");

  /** View that contains the transparent shadow that is overlaid on top of the contact image. */

java/com/android/dialer/callcomposer/camera/CameraManager.java

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class CameraManager implements FocusOverlayManager.Listener { 


  private static final int NO_CAMERA_SELECTED = -1;



  private static final Camera.ShutterCallback DUMMY_SHUTTER_CALLBACK =

  private static final Camera.ShutterCallback NOOP_SHUTTER_CALLBACK =

      new Camera.ShutterCallback() {

        @Override

        public void onShutter() {
@@ -493,7 +493,7 @@ public class CameraManager implements FocusOverlayManager.Listener { 
    try {

      this.camera.takePicture(

          // A shutter callback is required to enable shutter sound

          DUMMY_SHUTTER_CALLBACK, null /* raw */, null /* postView */, jpegCallback);

              NOOP_SHUTTER_CALLBACK, null /* raw */, null /* postView */, jpegCallback);

    } catch (final RuntimeException e) {

      LogUtil.e("CameraManager.takePicture", "RuntimeException in CameraManager.takePicture", e);

      takingPicture = false;

java/com/android/dialer/contactphoto/ContactPhotoManagerImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ class ContactPhotoManagerImpl extends ContactPhotoManager implements Callback { 
  private static final String[] COLUMNS = new String[] {Photo._ID, Photo.PHOTO};



  /**

   * Dummy object used to indicate that a bitmap for a given key could not be stored in the cache.

   * Placeholder object used to indicate that a bitmap for a given key could not be stored in the

   * cache.

   */

  private static final BitmapHolder BITMAP_UNAVAILABLE;

  /** Cache size for {@link #bitmapHolderCache} for devices with "large" RAM. */

java/com/android/dialer/database/FilteredNumberContract.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public final class FilteredNumberContract { 


  public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);



  /** The type of filtering to be applied, e.g. block the number or whitelist the number. */

  /** The type of filtering to be applied, e.g. block the number or allow the number. */

  public interface FilteredNumberTypes {



    int UNDEFINED = 0;

java/com/android/dialer/phonelookup/phone_lookup_info.proto

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ message PhoneLookupInfo { 
  }

  optional PeopleApiInfo people_api_info = 3;



  // Whether a number is blocked or not. Used by both the system blacklist and

  // Whether a number is blocked or not. Used by both the system block list and

  // dialer fallback

  enum BlockedState {

    UNKNOWN = 0;