From 73745d4a851e815e7d51f09a9a80f8f0508bc82e Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Thu, 10 Aug 2023 03:59:17 +0000 Subject: [PATCH] Revert "Add WALLPAPER_PICKER_GRID_APPLY_BUTTON to SysUi Flags.kt" Revert submission 24343660-picker-apply-button Reason for revert: Build break on git_main branch on several targets Reverted changes: /q/submissionid:24343660-picker-apply-button Bug: 295257360 Change-Id: Ie634911352e4f5c37cc5f561fd30f81b49889f6e Merged-In: Ie634911352e4f5c37cc5f561fd30f81b49889f6e --- .../data/content/CustomizationProviderContract.kt | 3 --- packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 6 ------ 2 files changed, 9 deletions(-) diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt index 92d2bd253a83f..46f5971405df0 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt @@ -190,9 +190,6 @@ object CustomizationProviderContract { /** Flag denoting transit clock are enabled in wallpaper picker. */ const val FLAG_NAME_PAGE_TRANSITIONS = "wallpaper_picker_page_transitions" - /** Flag denoting adding apply button to wallpaper picker's grid preview page. */ - const val FLAG_NAME_GRID_APPLY_BUTTON = "wallpaper_picker_grid_apply_button" - /** Flag denoting whether preview loading animation is enabled. */ const val FLAG_NAME_WALLPAPER_PICKER_PREVIEW_ANIMATION = "wallpaper_picker_preview_animation" diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index d1a9d6bcb86d4..d1281f290e72d 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -226,12 +226,6 @@ object Flags { val WALLPAPER_PICKER_PAGE_TRANSITIONS = unreleasedFlag("wallpaper_picker_page_transitions") - /** Add "Apply" button to wall paper picker's grid preview page. */ - // TODO(b/294866904): Tracking bug. - @JvmField - val WALLPAPER_PICKER_GRID_APPLY_BUTTON = - unreleasedFlag("wallpaper_picker_grid_apply_button") - /** Whether to run the new udfps keyguard refactor code. */ // TODO(b/279440316): Tracking bug. @JvmField