Removes summary text from Instant Apps details
Test: Robolectric test to ensure header item is GONE.
Bug: 36512295
Change-Id: I020e90d6521c853e67ae600e5786445a8469a934
(cherry picked from commit 14a258443fa4f512531a99b0c11ac7d2b06ce378)
diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/applications/AppHeaderController.java
index 0bc9f8f..fb4b122 100644
--- a/src/com/android/settings/applications/AppHeaderController.java
+++ b/src/com/android/settings/applications/AppHeaderController.java
@@ -215,15 +215,15 @@
}
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 828eca6..1fc5515 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -546,13 +546,16 @@
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 79f452a..a8c7c65 100644
--- a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
@@ -287,6 +287,8 @@
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