From 2e950fca63e7038807ec73420c4d1dd6dc40539e Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Mon, 23 Oct 2017 14:05:45 -0700 Subject: [PATCH] Set uninstall button to gray color. 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 --- .../applications/InstalledAppDetails.java | 2 +- .../applications/InstalledAppDetailsTest.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index ccd91fdbcc7..84ac189573c 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -348,7 +348,7 @@ public class InstalledAppDetails extends AppInfoBase enabled = false; mActionButtons.setButton1Visible(false); } - mActionButtons.setButton1Text(R.string.uninstall_text); + mActionButtons.setButton1Text(R.string.uninstall_text).setButton1Positive(false); return enabled; } diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java index 93f364ba150..58a957704de 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java @@ -564,6 +564,21 @@ public final class InstalledAppDetailsTest { 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) public static class ShadowUtils { @Implementation