Use DateUtils to build account sync timestamp
Change-Id: I2158855bd2caba42f64d24ab2fb00c6b561e5cef Fixes: 77913394 Test: visual
This commit is contained in:
@@ -33,8 +33,6 @@ import com.android.settings.Utils;
|
|||||||
import com.android.settingslib.accounts.AuthenticatorHelper;
|
import com.android.settingslib.accounts.AuthenticatorHelper;
|
||||||
import com.android.settingslib.utils.ThreadUtils;
|
import com.android.settingslib.utils.ThreadUtils;
|
||||||
|
|
||||||
import java.util.Date;
|
|
||||||
|
|
||||||
abstract class AccountPreferenceBase extends SettingsPreferenceFragment
|
abstract class AccountPreferenceBase extends SettingsPreferenceFragment
|
||||||
implements AuthenticatorHelper.OnAccountsUpdateListener {
|
implements AuthenticatorHelper.OnAccountsUpdateListener {
|
||||||
|
|
||||||
@@ -129,9 +127,4 @@ abstract class AccountPreferenceBase extends SettingsPreferenceFragment
|
|||||||
protected CharSequence getLabelForType(final String accountType) {
|
protected CharSequence getLabelForType(final String accountType) {
|
||||||
return mAuthenticatorHelper.getLabelForType(getActivity(), accountType);
|
return mAuthenticatorHelper.getLabelForType(getActivity(), accountType);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected String formatSyncDate(Date date) {
|
|
||||||
// TODO: Switch to using DateUtils.formatDateTime
|
|
||||||
return mDateFormat.format(date) + " " + mTimeFormat.format(date);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@@ -37,6 +37,7 @@ import android.os.UserHandle;
|
|||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
import android.support.v7.preference.Preference;
|
import android.support.v7.preference.Preference;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
import android.text.format.DateUtils;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
@@ -462,7 +463,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
|
|||||||
syncPref.setSummary(R.string.sync_in_progress);
|
syncPref.setSummary(R.string.sync_in_progress);
|
||||||
} else if (successEndTime != 0) {
|
} else if (successEndTime != 0) {
|
||||||
date.setTime(successEndTime);
|
date.setTime(successEndTime);
|
||||||
final String timeString = formatSyncDate(date);
|
final String timeString = formatSyncDate(getContext(), date);
|
||||||
syncPref.setSummary(getResources().getString(R.string.last_synced, timeString));
|
syncPref.setSummary(getResources().getString(R.string.last_synced, timeString));
|
||||||
} else {
|
} else {
|
||||||
syncPref.setSummary("");
|
syncPref.setSummary("");
|
||||||
@@ -575,4 +576,11 @@ public class AccountSyncSettings extends AccountPreferenceBase {
|
|||||||
public int getHelpResource() {
|
public int getHelpResource() {
|
||||||
return R.string.help_url_accounts;
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package com.android.settings.accounts;
|
package com.android.settings.accounts;
|
||||||
|
|
||||||
|
import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH;
|
||||||
|
|
||||||
import android.content.BroadcastReceiver;
|
import android.content.BroadcastReceiver;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
@@ -35,8 +37,6 @@ import com.android.settings.Utils;
|
|||||||
import com.android.settingslib.RestrictedLockUtils;
|
import com.android.settingslib.RestrictedLockUtils;
|
||||||
import com.android.settingslib.RestrictedSwitchPreference;
|
import com.android.settingslib.RestrictedSwitchPreference;
|
||||||
|
|
||||||
import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Setting page for managed profile.
|
* Setting page for managed profile.
|
||||||
* FIXME: It currently assumes there is only one managed profile.
|
* FIXME: It currently assumes there is only one managed profile.
|
||||||
|
Reference in New Issue
Block a user