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

Merge "Use system-api lib to get badged, shadowed icons"

Browse Source
This commit is contained in:
Tsung-Mao Fang
2020-02-06 09:01:21 +00:00
committed by Android (Google) Code Review
parent 07d9557b29 323347afcc
commit 4620cddba4
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/applications/RecentAppsPreferenceController.java
View File

@@ -22,7 +22,6 @@ import android.app.usage.UsageStats;
import android.content.Context; import android.content.Context;
import android.icu.text.RelativeDateTimeFormatter; import android.icu.text.RelativeDateTimeFormatter;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.IconDrawableFactory;
import android.view.View; import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -37,6 +36,7 @@ import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.Utils;
import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.utils.StringUtil; import com.android.settingslib.utils.StringUtil;
@@ -65,7 +65,6 @@ public class RecentAppsPreferenceController extends BasePreferenceController
private final ApplicationsState mApplicationsState; private final ApplicationsState mApplicationsState;
private final int mUserId; private final int mUserId;
private final IconDrawableFactory mIconDrawableFactory;
private final MetricsFeatureProvider mMetricsFeatureProvider; private final MetricsFeatureProvider mMetricsFeatureProvider;
private Fragment mHost; private Fragment mHost;
@@ -76,7 +75,6 @@ public class RecentAppsPreferenceController extends BasePreferenceController
mApplicationsState = ApplicationsState.getInstance( mApplicationsState = ApplicationsState.getInstance(
(Application) mContext.getApplicationContext()); (Application) mContext.getApplicationContext());
mUserId = UserHandle.myUserId(); mUserId = UserHandle.myUserId();
mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
mMetricsFeatureProvider = FeatureFactory.getFactory(mContext).getMetricsFeatureProvider(); mMetricsFeatureProvider = FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
} }
@@ -161,7 +159,7 @@ public class RecentAppsPreferenceController extends BasePreferenceController
} }
return new AppEntityInfo.Builder() return new AppEntityInfo.Builder()
.setIcon(mIconDrawableFactory.getBadgedIcon(appEntry.info)) .setIcon(Utils.getBadgedIcon(mContext, appEntry.info))
.setTitle(appEntry.label) .setTitle(appEntry.label)
.setSummary(StringUtil.formatRelativeTime(mContext, .setSummary(StringUtil.formatRelativeTime(mContext,
System.currentTimeMillis() - stat.getLastTimeUsed(), false, System.currentTimeMillis() - stat.getLastTimeUsed(), false,

2
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -1460,7 +1460,7 @@ public class ManageApplications extends InstrumentedFragment
ApplicationsState.AppEntry entry = mEntries.get(position); ApplicationsState.AppEntry entry = mEntries.get(position);
synchronized (entry) { synchronized (entry) {
holder.setTitle(entry.label); holder.setTitle(entry.label);
holder.setIcon(mIconDrawableFactory.getBadgedIcon(entry.info)); holder.setIcon(Utils.getBadgedIcon(mContext, entry.info));
updateSummary(holder, entry); updateSummary(holder, entry);
updateSwitch(holder, entry); updateSwitch(holder, entry);
holder.updateDisableView(entry.info); holder.updateDisableView(entry.info);

3
tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
View File

@@ -366,6 +366,7 @@ public class ManageApplicationsTest {
appEntry.extraInfo = mock(AppFilterItem.class); appEntry.extraInfo = mock(AppFilterItem.class);
appList.add(appEntry); appList.add(appEntry);
ReflectionHelpers.setField(adapter, "mEntries", appList); ReflectionHelpers.setField(adapter, "mEntries", appList);
ReflectionHelpers.setField(adapter, "mContext", mContext);
adapter.onBindViewHolder(holder, 0); adapter.onBindViewHolder(holder, 0);
// no crash? yay! // no crash? yay!
@@ -387,6 +388,7 @@ public class ManageApplicationsTest {
appEntry.info = mock(ApplicationInfo.class); appEntry.info = mock(ApplicationInfo.class);
appList.add(appEntry); appList.add(appEntry);
ReflectionHelpers.setField(adapter, "mEntries", appList); ReflectionHelpers.setField(adapter, "mEntries", appList);
ReflectionHelpers.setField(adapter, "mContext", mContext);
adapter.onBindViewHolder(holder, 0); adapter.onBindViewHolder(holder, 0);
verify(holder).updateSwitch(any(), anyBoolean(), anyBoolean()); verify(holder).updateSwitch(any(), anyBoolean(), anyBoolean());
@@ -406,6 +408,7 @@ public class ManageApplicationsTest {
appEntry.info = mock(ApplicationInfo.class); appEntry.info = mock(ApplicationInfo.class);
appList.add(appEntry); appList.add(appEntry);
ReflectionHelpers.setField(adapter, "mEntries", appList); ReflectionHelpers.setField(adapter, "mEntries", appList);
ReflectionHelpers.setField(adapter, "mContext", mContext);
adapter.onBindViewHolder(holder, 0); adapter.onBindViewHolder(holder, 0);
verify(holder, never()).updateSwitch(any(), anyBoolean(), anyBoolean()); verify(holder, never()).updateSwitch(any(), anyBoolean(), anyBoolean());