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

Set uninstall button to gray color.

Browse Source 
For user installed app, set the uninstall button as negative button so
that it will have the correct color.

Change-Id: Ic631386affddf82ae0ebbf29fb572de1f067fc90
Fixes: 68154647
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2017-10-23 14:05:45 -07:00
parent 9d85cfe762
commit 2e950fca63
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -348,7 +348,7 @@ public class InstalledAppDetails extends AppInfoBase
enabled = false; enabled = false;
mActionButtons.setButton1Visible(false); mActionButtons.setButton1Visible(false);
} }
mActionButtons.setButton1Text(R.string.uninstall_text); mActionButtons.setButton1Text(R.string.uninstall_text).setButton1Positive(false);
return enabled; return enabled;
} }

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

@@ -564,6 +564,21 @@ public final class InstalledAppDetailsTest {
mAppDetail.mBatteryCallbacks); mAppDetail.mBatteryCallbacks);
} }
@Test
public void initUninstallButtonForUserApp_shouldSetNegativeButton() {
final ApplicationInfo info = new ApplicationInfo();
info.flags = ApplicationInfo.FLAG_INSTALLED;
info.enabled = true;
final PackageInfo packageInfo = mock(PackageInfo.class);
packageInfo.applicationInfo = info;
ReflectionHelpers.setField(mAppDetail, "mUserManager", mUserManager);
ReflectionHelpers.setField(mAppDetail, "mPackageInfo", packageInfo);
mAppDetail.initUninstallButtonForUserApp();
verify(mAppDetail.mActionButtons).setButton1Positive(false);
}
@Implements(Utils.class) @Implements(Utils.class)
public static class ShadowUtils { public static class ShadowUtils {
@Implementation @Implementation