Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80be9303 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add timestamp to recent used apps" into qt-dev

parents 8888d346 c359536d

src/com/android/settings/location/RecentLocationAccessPreferenceController.java

+5 −1
Original line number Diff line number Diff line
@@ -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,

tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java

+0 −6
Original line number Diff line number Diff line
@@ -129,32 +129,26 @@ public class RecentLocationAccessPreferenceControllerTest { 
        final View app1View = mAppEntitiesHeaderView.findViewById(R.id.app1_view);

        final ImageView appIconView1 = app1View.findViewById(R.id.app_icon);

        final TextView appTitle1 = app1View.findViewById(R.id.app_title);

        final TextView appSummary1 = app1View.findViewById(R.id.app_summary);



        assertThat(app1View.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(appIconView1.getDrawable()).isNotNull();

        assertThat(appTitle1.getText()).isEqualTo("appTitle0");

        assertThat(appSummary1.getText()).isEqualTo("appSummary0");



        final View app2View = mAppEntitiesHeaderView.findViewById(R.id.app2_view);

        final ImageView appIconView2 = app2View.findViewById(R.id.app_icon);

        final TextView appTitle2 = app2View.findViewById(R.id.app_title);

        final TextView appSummary2 = app2View.findViewById(R.id.app_summary);



        assertThat(app2View.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(appIconView2.getDrawable()).isNotNull();

        assertThat(appTitle2.getText()).isEqualTo("appTitle1");

        assertThat(appSummary2.getText()).isEqualTo("appSummary1");



        final View app3View = mAppEntitiesHeaderView.findViewById(R.id.app3_view);

        final ImageView appIconView3 = app3View.findViewById(R.id.app_icon);

        final TextView appTitle3 = app3View.findViewById(R.id.app_title);

        final TextView appSummary3 = app3View.findViewById(R.id.app_summary);



        assertThat(app3View.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(appIconView3.getDrawable()).isNotNull();

        assertThat(appTitle3.getText()).isEqualTo("appTitle2");

        assertThat(appSummary3.getText()).isEqualTo("appSummary2");

    }



    private List<RecentLocationAccesses.Access> createMockAccesses(int count) {