diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2019-04-09 10:19:53 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2019-04-09 17:22:30 +0000 |
| commit | deb7cd54e738d1a3476621425a6894910417354e (patch) | |
| tree | 87832c98860a8f56ad39c6784557f9706766c793 | |
| parent | 4736b17a9929864e8ed80def7f220aa3c386e96d (diff) | |
| download | packages_apps_Trebuchet-deb7cd54e738d1a3476621425a6894910417354e.tar.gz packages_apps_Trebuchet-deb7cd54e738d1a3476621425a6894910417354e.tar.bz2 packages_apps_Trebuchet-deb7cd54e738d1a3476621425a6894910417354e.zip | |
Remove FeatureFlags.STYLE_WALLPAPERS
Bug: 129874298
Change-Id: I2785f1e49a4ff60143cc763c3dac0c1bb33b41c8
3 files changed, 2 insertions, 7 deletions
diff --git a/robolectric_tests/src/com/android/launcher3/config/FlagOverrideSampleTest.java b/robolectric_tests/src/com/android/launcher3/config/FlagOverrideSampleTest.java index 656d55c44..ae81ff252 100644 --- a/robolectric_tests/src/com/android/launcher3/config/FlagOverrideSampleTest.java +++ b/robolectric_tests/src/com/android/launcher3/config/FlagOverrideSampleTest.java @@ -26,7 +26,6 @@ public class FlagOverrideSampleTest { @Test public void withFlagOn() { assertTrue(FeatureFlags.EXAMPLE_FLAG.get()); - assertFalse(FeatureFlags.STYLE_WALLPAPER.get()); } diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java index 5150b7c67..a55ea82c5 100644 --- a/src/com/android/launcher3/config/BaseFlags.java +++ b/src/com/android/launcher3/config/BaseFlags.java @@ -90,10 +90,6 @@ abstract class BaseFlags { // trying to make them fit the orientation the device is in. public static final boolean OVERVIEW_USE_SCREENSHOT_ORIENTATION = true; - public static final ToggleableGlobalSettingsFlag STYLE_WALLPAPER - = new ToggleableGlobalSettingsFlag("STYLE_WALLPAPER", false, - "Direct users to the new ThemePicker based WallpaperPicker"); - /** * Feature flag to handle define config changes dynamically instead of killing the process. */ diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index 6a2f0ffa2..29866cf9a 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -152,7 +152,7 @@ public class OptionsPopupView extends ArrowPopup RectF target = new RectF(x - halfSize, y - halfSize, x + halfSize, y + halfSize); ArrayList<OptionItem> options = new ArrayList<>(); - int res = FeatureFlags.STYLE_WALLPAPER.get() && existsStyleWallpapers(launcher) ? + int res = existsStyleWallpapers(launcher) ? R.string.styles_wallpaper_button_text : R.string.wallpaper_button_text; options.add(new OptionItem(res, R.drawable.ic_wallpaper, ControlType.WALLPAPER_BUTTON, OptionsPopupView::startWallpaperPicker)); @@ -210,7 +210,7 @@ public class OptionsPopupView extends ArrowPopup .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK) .putExtra(EXTRA_WALLPAPER_OFFSET, launcher.getWorkspace().getWallpaperOffsetForCenterPage()); - if (!FeatureFlags.STYLE_WALLPAPER.get()) { + if (!existsStyleWallpapers(launcher)) { intent.putExtra(EXTRA_WALLPAPER_FLAVOR, "wallpaper_only"); } String pickerPackage = launcher.getString(R.string.wallpaper_picker_package); |