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

Commit b879515a authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Update language to comply with Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for reference

Test: Presubmit
Bug: 161896447
Change-Id: I2cd36fd5148608caec816c159c1b5d6bfbe192bc
parent 434cfb8a
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line 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.
  // 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_OFFSET = -0.12f;
  private static final float DEFAULT_IMAGE_LETTER_SCALE = 0.70f;
  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
  // don't crash with an NPE if the drag shadow is released in their bounds
  private static final ClipData EMPTY_CLIP_DATA = ClipData.newPlainText("", "");
  private static final ClipData EMPTY_CLIP_DATA = ClipData.newPlainText("", "");
  /** View that contains the transparent shadow that is overlaid on top of the contact image. */
  /** View that contains the transparent shadow that is overlaid on top of the contact image. */
+2 −2
Original line number Original line 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 int NO_CAMERA_SELECTED = -1;


  private static final Camera.ShutterCallback DUMMY_SHUTTER_CALLBACK =
  private static final Camera.ShutterCallback NOOP_SHUTTER_CALLBACK =
      new Camera.ShutterCallback() {
      new Camera.ShutterCallback() {
        @Override
        @Override
        public void onShutter() {
        public void onShutter() {
@@ -493,7 +493,7 @@ public class CameraManager implements FocusOverlayManager.Listener {
    try {
    try {
      this.camera.takePicture(
      this.camera.takePicture(
          // A shutter callback is required to enable shutter sound
          // 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) {
    } catch (final RuntimeException e) {
      LogUtil.e("CameraManager.takePicture", "RuntimeException in CameraManager.takePicture", e);
      LogUtil.e("CameraManager.takePicture", "RuntimeException in CameraManager.takePicture", e);
      takingPicture = false;
      takingPicture = false;
+2 −1
Original line number Original line 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};
  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;
  private static final BitmapHolder BITMAP_UNAVAILABLE;
  /** Cache size for {@link #bitmapHolderCache} for devices with "large" RAM. */
  /** Cache size for {@link #bitmapHolderCache} for devices with "large" RAM. */
+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ public final class FilteredNumberContract {


  public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);
  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 {
  public interface FilteredNumberTypes {


    int UNDEFINED = 0;
    int UNDEFINED = 0;
+1 −1
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ message PhoneLookupInfo {
  }
  }
  optional PeopleApiInfo people_api_info = 3;
  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
  // dialer fallback
  enum BlockedState {
  enum BlockedState {
    UNKNOWN = 0;
    UNKNOWN = 0;
Loading