| commit | 48e84f69b60cb7f3dc722831dc5944d8a0426388 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 17 16:45:55 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 17 16:45:55 2019 +0000 |
| tree | 6529454af0c435220b2bd7fc24ac2483cab18c7a | |
| parent | 7174e63a83a5cd6cd5ddc6310527278dfd7f28ec [diff] | |
| parent | f96fb244174fe42a1e1857673dff065cd8e68286 [diff] |
Merge "Use white text and a scrim for the cover page" into ub-launcher3-qt-dev
diff --git a/res/values/colors.xml b/res/values/colors.xml index ee4207e..bc27623 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml
@@ -54,7 +54,6 @@ <color name="selected_check_background_color">#1E8E3E</color> <color name="toolbar_icon_color">@color/text_color_dark</color> - <color name="toolbar_color">@color/material_white_100</color> <color name="divider_color">@color/black_14_alpha</color>
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
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; } /**