Merge "Add timestamp to recent used apps" into qt-dev am: 80be930357

am: 68310109ef

Change-Id: I4e37834459b5019c18d41715f287b504ab242eec
This commit is contained in:
Lifu Tang
2019-04-30 00:17:02 -07:00
committed by android-build-merger
2 changed files with 5 additions and 7 deletions

View File

@@ -18,6 +18,7 @@ import static java.util.concurrent.TimeUnit.DAYS;
import android.Manifest;
import android.content.Context;
import android.content.Intent;
import android.icu.text.RelativeDateTimeFormatter;
import android.provider.DeviceConfig;
import android.view.View;
@@ -30,6 +31,7 @@ import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.location.RecentLocationAccesses;
import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.AppEntitiesHeaderController;
import com.android.settingslib.widget.AppEntityInfo;
import com.android.settingslib.widget.LayoutPreference;
@@ -101,7 +103,9 @@ public class RecentLocationAccessPreferenceController extends AbstractPreference
final AppEntityInfo appEntityInfo = new AppEntityInfo.Builder()
.setIcon(access.icon)
.setTitle(access.label)
.setSummary(access.contentDescription)
.setSummary(StringUtil.formatRelativeTime(mContext,
System.currentTimeMillis() - access.accessFinishTime, false,
RelativeDateTimeFormatter.Style.SHORT))
.setOnClickListener((v) -> {
final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSION);
intent.putExtra(Intent.EXTRA_PERMISSION_NAME,