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

Do not show installation status on Q

Browse Source 
Test: robotest, visual
Bug: 116340579
Change-Id: I0b414f3faffe8a96cccb310abca74c585c9ac1f2
This commit is contained in:
tmfang
2018-11-08 17:34:38 +08:00
parent 3ea0143ae5
commit bbca29b6f4
4 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
View File

@@ -90,12 +90,9 @@ public class AppHeaderViewPreferenceController extends BasePreferenceController
private void setAppLabelAndIcon(PackageInfo pkgInfo, AppEntry appEntry) { private void setAppLabelAndIcon(PackageInfo pkgInfo, AppEntry appEntry) {
final Activity activity = mParent.getActivity(); final Activity activity = mParent.getActivity();
final boolean isInstantApp = AppUtils.isInstant(pkgInfo.applicationInfo); final boolean isInstantApp = AppUtils.isInstant(pkgInfo.applicationInfo);
final CharSequence summary = isInstantApp
? null : mContext.getString(Utils.getInstallationStatus(appEntry.info));
mEntityHeaderController mEntityHeaderController
.setLabel(appEntry) .setLabel(appEntry)
.setIcon(appEntry) .setIcon(appEntry)
.setSummary(summary)
.setIsInstantApp(isInstantApp) .setIsInstantApp(isInstantApp)
.done(activity, false /* rebindActions */); .done(activity, false /* rebindActions */);
} }

3
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -235,10 +235,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
controller.setLabel(mAppEntry); controller.setLabel(mAppEntry);
controller.setIcon(mAppEntry); controller.setIcon(mAppEntry);
boolean isInstantApp = AppUtils.isInstant(mAppEntry.info); boolean isInstantApp = AppUtils.isInstant(mAppEntry.info);
CharSequence summary = isInstantApp
? null : getString(Utils.getInstallationStatus(mAppEntry.info));
controller.setIsInstantApp(AppUtils.isInstant(mAppEntry.info)); controller.setIsInstantApp(AppUtils.isInstant(mAppEntry.info));
controller.setSummary(summary);
} }
controller.done(context, true /* rebindActions */); controller.done(context, true /* rebindActions */);

3
tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
View File

@@ -106,15 +106,12 @@ public class AppHeaderViewPreferenceControllerTest {
final TextView title = mHeader.findViewById(R.id.entity_header_title); final TextView title = mHeader.findViewById(R.id.entity_header_title);
final TextView summary = mHeader.findViewById(R.id.entity_header_summary);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
mController.refreshUi(); mController.refreshUi();
assertThat(title).isNotNull(); assertThat(title).isNotNull();
assertThat(title.getText()).isEqualTo(appLabel); assertThat(title.getText()).isEqualTo(appLabel);
assertThat(summary).isNotNull();
assertThat(summary.getText()).isEqualTo(mContext.getString(R.string.installed));
} }
@Test @Test

1
tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
View File

@@ -258,7 +258,6 @@ public class AdvancedPowerUsageDetailTest {
verify(mEntityHeaderController).setIcon(mAppEntry); verify(mEntityHeaderController).setIcon(mAppEntry);
verify(mEntityHeaderController).setLabel(mAppEntry); verify(mEntityHeaderController).setLabel(mAppEntry);
verify(mEntityHeaderController).setIsInstantApp(true); verify(mEntityHeaderController).setIsInstantApp(true);
verify(mEntityHeaderController).setSummary((CharSequence) null);
} }
@Test @Test