commit d26ddbf398bcabc6a3114a0728c1a42710e5b093
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 16 18:56:00 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 16 18:56:00 2019 +0000
tree cb68f3627db412e0dc1d3d56a686d2135582d03b
parent 3bc2536d1ae522e8e519252cbe82acb56cc7ea50
parent 81661f002585a124b2a4ec1818e56761275c13ea

Merge "Update checkmark to match spec" 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 375f3c1..5964236 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;
+        return mProviderInfo != null && mProviderInfo.isEnabled();
     }
 
     @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 7c7f8d4..af7745a 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;
+        return mProviderInfo != null && mProviderInfo.isEnabled();
     }
 
     /**