From b6d40d133bc5c3946e9c69b9ebbfb87ab38892b0 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Fri, 13 Apr 2018 15:25:32 -0700
Subject: [PATCH] Use DateUtils to build account sync timestamp

Change-Id: I2158855bd2caba42f64d24ab2fb00c6b561e5cef
Fixes: 77913394
Test: visual
---
 .../settings/accounts/AccountPreferenceBase.java       |  7 -------
 .../android/settings/accounts/AccountSyncSettings.java | 10 +++++++++-
 .../settings/accounts/ManagedProfileSettings.java      |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index 54ddf64eaaf..bdf9c98a054 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -33,8 +33,6 @@ import com.android.settings.Utils;
 import com.android.settingslib.accounts.AuthenticatorHelper;
 import com.android.settingslib.utils.ThreadUtils;
 
-import java.util.Date;
-
 abstract class AccountPreferenceBase extends SettingsPreferenceFragment
         implements AuthenticatorHelper.OnAccountsUpdateListener {
 
@@ -129,9 +127,4 @@ abstract class AccountPreferenceBase extends SettingsPreferenceFragment
     protected CharSequence getLabelForType(final String accountType) {
         return mAuthenticatorHelper.getLabelForType(getActivity(), accountType);
     }
-
-    protected String formatSyncDate(Date date) {
-        // TODO: Switch to using DateUtils.formatDateTime
-        return mDateFormat.format(date) + " " + mTimeFormat.format(date);
-    }
 }
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 6b60e87f85c..fd2e2c557b1 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -37,6 +37,7 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
+import android.text.format.DateUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -462,7 +463,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
                 syncPref.setSummary(R.string.sync_in_progress);
             } else if (successEndTime != 0) {
                 date.setTime(successEndTime);
-                final String timeString = formatSyncDate(date);
+                final String timeString = formatSyncDate(getContext(), date);
                 syncPref.setSummary(getResources().getString(R.string.last_synced, timeString));
             } else {
                 syncPref.setSummary("");
@@ -575,4 +576,11 @@ public class AccountSyncSettings extends AccountPreferenceBase {
     public int getHelpResource() {
         return R.string.help_url_accounts;
     }
+
+    private static String formatSyncDate(Context context, Date date) {
+        return DateUtils.formatDateTime(context, date.getTime(),
+                DateUtils.FORMAT_SHOW_DATE
+                        | DateUtils.FORMAT_SHOW_YEAR
+                        | DateUtils.FORMAT_SHOW_TIME);
+    }
 }
diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java
index 09330428d39..8a519658b92 100644
--- a/src/com/android/settings/accounts/ManagedProfileSettings.java
+++ b/src/com/android/settings/accounts/ManagedProfileSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.accounts;
 
+import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -35,8 +37,6 @@ import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
-import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH;
-
 /**
  * Setting page for managed profile.
  * FIXME: It currently assumes there is only one managed profile.