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

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

Browse Source
This commit is contained in:
Jesse Evans
2017-04-02 16:13:53 +00:00
committed by Android (Google) Code Review
parent 1b5015cae6 15c7f5fda4
commit 8fc0d1f948
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/AppHeaderController.java
View File

@@ -219,15 +219,15 @@ public class AppHeaderController {
} }
setText(R.id.app_detail_title, mLabel); setText(R.id.app_detail_title, mLabel);
setText(R.id.app_detail_summary, mSummary); setText(R.id.app_detail_summary, mSummary);
if (rebindActions) {
bindAppHeaderButtons();
}
if (mIsInstantApp) { if (mIsInstantApp) {
setText(R.id.install_type, setText(R.id.install_type,
mAppHeader.getResources().getString(R.string.install_type_instant)); mAppHeader.getResources().getString(R.string.install_type_instant));
} }
if (rebindActions) {
bindAppHeaderButtons();
}
return mAppHeader; return mAppHeader;
} }

7
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -546,13 +546,16 @@ public class InstalledAppDetails extends AppInfoBase
final View appSnippet = mHeader.findViewById(R.id.app_snippet); final View appSnippet = mHeader.findViewById(R.id.app_snippet);
mState.ensureIcon(mAppEntry); mState.ensureIcon(mAppEntry);
final Activity activity = getActivity(); final Activity activity = getActivity();
final boolean isInstantApp = AppUtils.isInstant(mPackageInfo.applicationInfo);
final CharSequence summary =
isInstantApp ? null : getString(Utils.getInstallationStatus(mAppEntry.info));
FeatureFactory.getFactory(activity) FeatureFactory.getFactory(activity)
.getApplicationFeatureProvider(activity) .getApplicationFeatureProvider(activity)
.newAppHeaderController(this, appSnippet) .newAppHeaderController(this, appSnippet)
.setLabel(mAppEntry) .setLabel(mAppEntry)
.setIcon(mAppEntry) .setIcon(mAppEntry)
.setSummary(getString(Utils.getInstallationStatus(mAppEntry.info))) .setSummary(summary)
.setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo)) .setIsInstantApp(isInstantApp)
.done(false /* rebindActions */); .done(false /* rebindActions */);
mVersionPreference.setSummary(getString(R.string.version_text, pkgInfo.versionName)); mVersionPreference.setSummary(getString(R.string.version_text, pkgInfo.versionName));
} }

2
tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
View File

@@ -301,6 +301,8 @@ public class AppHeaderControllerTest {
assertThat(label.getVisibility()).isEqualTo(View.VISIBLE); assertThat(label.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(label.getText()).isEqualTo( assertThat(label.getText()).isEqualTo(
appHeader.getResources().getString(R.string.install_type_instant)); appHeader.getResources().getString(R.string.install_type_instant));
assertThat(appHeader.findViewById(R.id.app_detail_summary).getVisibility())
.isEqualTo(View.GONE);
} }
@Test @Test