commit 2d6209e962325a0ef13ca11901b453bb4ec60e61
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 01 22:26:16 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 01 22:26:16 2019 +0000
tree fac5fc63cebc0e57d7b9d6edb3d135c065108b92
parent d30b020adb166cedb0402f20965fe92751271ddc
parent 000e7cabe584e9d156494555334b29d7ff3b3bbf

Merge "Update icon names" into ub-launcher3-master

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 3a73f83..794f068 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)