PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use DateUtils to build account sync timestamp

Browse Source 
Change-Id: I2158855bd2caba42f64d24ab2fb00c6b561e5cef
Fixes: 77913394
Test: visual
This commit is contained in:
Fan Zhang
2018-04-13 15:25:32 -07:00
parent b0339949a3
commit b6d40d133b
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/accounts/AccountPreferenceBase.java
View File

@@ -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);
}
}

10
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -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);
}
}

4
src/com/android/settings/accounts/ManagedProfileSettings.java
View File

@@ -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.