From 9e7c6d5ed673f002a6428a28b66e0f939577e7d2 Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Tue, 27 Sep 2022 11:40:28 +0800
Subject: [PATCH] Set showInstantApps = true for All App List

Instant Apps are designed only shows in the All App List and the Storage
App List.

Bug: 235727273
Test: Manual with Settings App
Change-Id: I42e49582c06a7e6aad20ad92627a631584597533
---
 src/com/android/settings/spa/app/AllAppList.kt                  | 1 +
 .../android/settings/spa/app/appsettings/AppDisableButton.kt    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/spa/app/AllAppList.kt b/src/com/android/settings/spa/app/AllAppList.kt
index c2215d48d76..7ecc28b9a90 100644
--- a/src/com/android/settings/spa/app/AllAppList.kt
+++ b/src/com/android/settings/spa/app/AllAppList.kt
@@ -66,6 +66,7 @@ private fun AllAppListPage() {
     AppListPage(
         title = stringResource(R.string.all_apps),
         listModel = rememberContext(::AllAppListModel),
+        showInstantApps = true,
     ) { itemModel ->
         AppListItem(
             itemModel = itemModel,
diff --git a/src/com/android/settings/spa/app/appsettings/AppDisableButton.kt b/src/com/android/settings/spa/app/appsettings/AppDisableButton.kt
index 6f5e671f8a8..ff3fbe3c10e 100644
--- a/src/com/android/settings/spa/app/appsettings/AppDisableButton.kt
+++ b/src/com/android/settings/spa/app/appsettings/AppDisableButton.kt
@@ -58,7 +58,7 @@ class AppDisableButton(
         if (!app.hasFlag(ApplicationInfo.FLAG_SYSTEM)) return null
 
         return when {
-            app.enabled && !app.isDisabledUntilUsed() -> {
+            app.enabled && !app.isDisabledUntilUsed -> {
                 disableButton(enabled = isDisableButtonEnabled(packageInfo))
             }