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

Commit 15c7f5fd authored by Jesse Evans's avatar Jesse Evans
Browse files

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 14a25844)
parent e5275858

src/com/android/settings/applications/AppHeaderController.java

+4 −4
Original line number Diff line number Diff line
@@ -215,15 +215,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;

    }

src/com/android/settings/applications/InstalledAppDetails.java

+5 −2
Original line number Diff line number Diff line
@@ -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));

    }

tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -287,6 +287,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