commit 7174e63a83a5cd6cd5ddc6310527278dfd7f28ec
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 17 09:25:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 17 09:25:35 2019 +0000
tree e3d811a776e1e6bd5b8753d16a9dbc272c340a8a
parent b2edb4de9db1d76db2d91f6f603867f1bd19b6de
parent 396ac5f1f8888eed7fee06bcb80bea11f05297dc

Merge "Fix toolbar color for WPP" into ub-launcher3-qt-dev

src/com/android/customization/model/clock/ContentProviderClockProvider.java

diff --git a/src/com/android/customization/model/clock/ContentProviderClockProvider.java b/src/com/android/customization/model/clock/ContentProviderClockProvider.java
index 5964236..375f3c1 100644
--- a/src/com/android/customization/model/clock/ContentProviderClockProvider.java
+++ b/src/com/android/customization/model/clock/ContentProviderClockProvider.java
@@ -37,7 +37,7 @@
 
     @Override
     public boolean isAvailable() {
-        return mProviderInfo != null && mProviderInfo.isEnabled();
+        return mProviderInfo != null;
     }
 
     @Override

src/com/android/customization/model/grid/LauncherGridOptionsProvider.java

diff --git a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
index af7745a..7c7f8d4 100644
--- a/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
+++ b/src/com/android/customization/model/grid/LauncherGridOptionsProvider.java
@@ -75,7 +75,7 @@
     }
 
     boolean areGridsAvailable() {
-        return mProviderInfo != null && mProviderInfo.isEnabled();
+        return mProviderInfo != null;
     }
 
     /**