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

Commit 6ecbdadd authored by Jesse Evans's avatar Jesse Evans Committed by android-build-merger
Browse files

Merge "Removes summary text from Instant Apps details" into oc-dev

am: 8fc0d1f9

Change-Id: I806826bd2b7ee5435f132d9f3db234878b9b429f
parents ff8eb394 8fc0d1f9
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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;
    }

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