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

Merge "Refresh the App Info option menu after unintalling app updates." into oc-dev

Browse Source 
am: 64857437a4

Change-Id: Ifa91856e910de3df6f695d1a31462ca8edda0822
This commit is contained in:
Doris Ling
2017-04-28 00:06:38 +00:00
committed by android-build-merger
parent 1081882be6 64857437a4
commit 42126366f1
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -526,6 +526,9 @@ public class InstalledAppDetails extends AppInfoBase
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) { switch (requestCode) {
case REQUEST_UNINSTALL: case REQUEST_UNINSTALL:
// Refresh option menu
getActivity().invalidateOptionsMenu();
if (mDisableAfterUninstall) { if (mDisableAfterUninstall) {
mDisableAfterUninstall = false; mDisableAfterUninstall = false;
new DisableChanger(this, mAppEntry.info, new DisableChanger(this, mAppEntry.info,

10
tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
View File

@@ -31,6 +31,7 @@ import static org.mockito.Mockito.when;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@@ -378,4 +379,13 @@ public final class InstalledAppDetailsTest {
verify(mockPreferenceScreen, times(1)) verify(mockPreferenceScreen, times(1))
.removePreference(mockAppDomainsPref); .removePreference(mockAppDomainsPref);
} }
@Test
public void onActivityResult_uninstalledUpdates_shouldInvalidateOptionsMenu() {
doReturn(true).when(mAppDetail).refreshUi();
mAppDetail.onActivityResult(InstalledAppDetails.REQUEST_UNINSTALL, 0, mock(Intent.class));
verify(mActivity).invalidateOptionsMenu();
}
} }