PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove FeatureFlags.STYLE_WALLPAPERS

Browse Source 
Bug: 129874298
Change-Id: I2785f1e49a4ff60143cc763c3dac0c1bb33b41c8
This commit is contained in:
Hyunyoung Song
2019-04-09 10:19:53 -07:00
parent 4736b17a99
commit deb7cd54e7
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
robolectric_tests/src/com/android/launcher3/config/FlagOverrideSampleTest.java
-1
View File
@@ -26,7 +26,6 @@ public class FlagOverrideSampleTest {
@Test @Test
public void withFlagOn() { public void withFlagOn() {
assertTrue(FeatureFlags.EXAMPLE_FLAG.get()); assertTrue(FeatureFlags.EXAMPLE_FLAG.get());
assertFalse(FeatureFlags.STYLE_WALLPAPER.get());
} }
src/com/android/launcher3/config/BaseFlags.java
-4
View File
@@ -90,10 +90,6 @@ abstract class BaseFlags {
// trying to make them fit the orientation the device is in. // trying to make them fit the orientation the device is in.
public static final boolean OVERVIEW_USE_SCREENSHOT_ORIENTATION = true; 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. * Feature flag to handle define config changes dynamically instead of killing the process.
*/ */
src/com/android/launcher3/views/OptionsPopupView.java
+2 -2
View File
@@ -152,7 +152,7 @@ public class OptionsPopupView extends ArrowPopup
RectF target = new RectF(x - halfSize, y - halfSize, x + halfSize, y + halfSize); RectF target = new RectF(x - halfSize, y - halfSize, x + halfSize, y + halfSize);
ArrayList<OptionItem> options = new ArrayList<>(); 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; R.string.styles_wallpaper_button_text : R.string.wallpaper_button_text;
options.add(new OptionItem(res, R.drawable.ic_wallpaper, options.add(new OptionItem(res, R.drawable.ic_wallpaper,
ControlType.WALLPAPER_BUTTON, OptionsPopupView::startWallpaperPicker)); ControlType.WALLPAPER_BUTTON, OptionsPopupView::startWallpaperPicker));
@@ -210,7 +210,7 @@ public class OptionsPopupView extends ArrowPopup
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
.putExtra(EXTRA_WALLPAPER_OFFSET, .putExtra(EXTRA_WALLPAPER_OFFSET,
launcher.getWorkspace().getWallpaperOffsetForCenterPage()); launcher.getWorkspace().getWallpaperOffsetForCenterPage());
if (!FeatureFlags.STYLE_WALLPAPER.get()) { if (!existsStyleWallpapers(launcher)) {
intent.putExtra(EXTRA_WALLPAPER_FLAVOR, "wallpaper_only"); intent.putExtra(EXTRA_WALLPAPER_FLAVOR, "wallpaper_only");
} }
String pickerPackage = launcher.getString(R.string.wallpaper_picker_package); String pickerPackage = launcher.getString(R.string.wallpaper_picker_package);