diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/applications/AppHeaderController.java index bb4b80d1add..b138edef671 100644 --- a/src/com/android/settings/applications/AppHeaderController.java +++ b/src/com/android/settings/applications/AppHeaderController.java @@ -219,15 +219,15 @@ public class AppHeaderController { } setText(R.id.app_detail_title, mLabel); setText(R.id.app_detail_summary, mSummary); - if (rebindActions) { - bindAppHeaderButtons(); - } - if (mIsInstantApp) { setText(R.id.install_type, mAppHeader.getResources().getString(R.string.install_type_instant)); } + if (rebindActions) { + bindAppHeaderButtons(); + } + return mAppHeader; } diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 828eca6a5ad..1fc5515e60c 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -546,13 +546,16 @@ public class InstalledAppDetails extends AppInfoBase final View appSnippet = mHeader.findViewById(R.id.app_snippet); mState.ensureIcon(mAppEntry); final Activity activity = getActivity(); + final boolean isInstantApp = AppUtils.isInstant(mPackageInfo.applicationInfo); + final CharSequence summary = + isInstantApp ? null : getString(Utils.getInstallationStatus(mAppEntry.info)); FeatureFactory.getFactory(activity) .getApplicationFeatureProvider(activity) .newAppHeaderController(this, appSnippet) .setLabel(mAppEntry) .setIcon(mAppEntry) - .setSummary(getString(Utils.getInstallationStatus(mAppEntry.info))) - .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo)) + .setSummary(summary) + .setIsInstantApp(isInstantApp) .done(false /* rebindActions */); mVersionPreference.setSummary(getString(R.string.version_text, pkgInfo.versionName)); } diff --git a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java index f3254539953..0d878ed7c6b 100644 --- a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java @@ -301,6 +301,8 @@ public class AppHeaderControllerTest { assertThat(label.getVisibility()).isEqualTo(View.VISIBLE); assertThat(label.getText()).isEqualTo( appHeader.getResources().getString(R.string.install_type_instant)); + assertThat(appHeader.findViewById(R.id.app_detail_summary).getVisibility()) + .isEqualTo(View.GONE); } @Test