Merge "Remove Time use."

package com.android.contacts.common.util;

import android.text.format.Time;

import java.time.Instant;

import java.time.LocalDate;

import java.time.ZoneId;

import java.time.temporal.ChronoUnit;

/** Utility methods for processing dates. */

public class DateUtils {

   * @param date2 Second date to check.

   * @return The absolute difference in days between the two dates.

   */

  public static int getDayDifference(Time time, long date1, long date2) {

    time.set(date1);

    int startDay = Time.getJulianDay(date1, time.gmtoff);

    time.set(date2);

    int currentDay = Time.getJulianDay(date2, time.gmtoff);

    return Math.abs(currentDay - startDay);

  public static int getDayDifference(ZoneId timeZone, long date1, long date2) {

    LocalDate localDate1 = Instant.ofEpochMilli(date1).atZone(timeZone).toLocalDate();

    LocalDate localDate2 = Instant.ofEpochMilli(date2).atZone(timeZone).toLocalDate();

    return Math.abs((int) ChronoUnit.DAYS.between(localDate2, localDate1));

  }

}

import android.support.annotation.VisibleForTesting;

import android.telephony.PhoneNumberUtils;

import android.text.TextUtils;

import android.text.format.Time;

import com.android.contacts.common.util.DateUtils;

import com.android.dialer.calllogutils.CallbackActionHelper;

import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction;

import com.android.dialer.inject.ApplicationContext;

import com.android.dialer.phonenumbercache.CallLogQuery;

import com.android.dialer.phonenumberutil.PhoneNumberHelper;

import java.time.ZoneId;

import java.util.Objects;

/**

  /** Day grouping for calls which occurred before last week. */

  public static final int DAY_GROUP_OTHER = 2;

  /** Instance of the time object used for time calculations. */

  private static final Time TIME = new Time();

  private static final ZoneId TIME_ZONE = ZoneId.systemDefault();

  private final Context appContext;

  /** The object on which the groups are created. */

   * @return The date group the call belongs in.

   */

  private int getDayGroup(long date, long now) {

    int days = DateUtils.getDayDifference(TIME, date, now);

    int days = DateUtils.getDayDifference(TIME_ZONE, date, now);

    if (days == 0) {

      return DAY_GROUP_TODAY;