commit d30b020adb166cedb0402f20965fe92751271ddc
author Santiago Etchebehere <santie@google.com> Thu Mar 28 13:34:43 2019 -0700
committer Santiago Etchebehere <santie@google.com> Thu Mar 28 13:34:43 2019 -0700
tree ac297939126a42983036481fddb4c4cdb8ff44c9
parent 025e16819e6062a2065e9f3d1fef786027717494

Remove check for custom themes

All CLs are in to support one custom theme, so enable them
again by default

Fixes: 124796742
Change-Id: I7beacd764726b897d96d21cbcedf8d2198a21bc1

src/com/android/customization/model/theme/DefaultThemeProvider.java

diff --git a/src/com/android/customization/model/theme/DefaultThemeProvider.java b/src/com/android/customization/model/theme/DefaultThemeProvider.java
index bcecc45..82afdce 100644
--- a/src/com/android/customization/model/theme/DefaultThemeProvider.java
+++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java
@@ -71,8 +71,6 @@
 public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeBundleProvider {
 
     private static final String TAG = "DefaultThemeProvider";
-    // TODO(b/124796742): remove once custom theme picker is ready to merge
-    private static final boolean SHOW_CUSTOM_THEME_OPTION = true;
 
     private static final String THEMES_ARRAY = "themes";
     private static final String TITLE_PREFIX = "theme_title_";
@@ -197,9 +195,7 @@
             }
         }
 
-        if (SHOW_CUSTOM_THEME_OPTION) {
-            addCustomTheme();
-        }
+        addCustomTheme();
     }
 
     private void addColorOverlay(Builder builder, String colorOverlayPackage)