| commit | 29053db69eb054ea7acca7d0dfb98e9fcc5a097e | [log] [tgz] |
|---|---|---|
| author | Jordan Demeulenaere <[email protected]> | Thu Aug 10 09:37:13 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Thu Aug 10 09:37:13 2023 +0000 |
| tree | f41832b097873fba8be7948e6994ba139b168e9c | |
| parent | 4b0aacb2ef2eeab61bce468c925ec1000526f712 [diff] | |
| parent | dea4d8e359e74b8319b9446acb6d1befa7623e62 [diff] |
Merge "Revert "Add WALLPAPER_PICKER_GRID_APPLY_BUTTON to SysUi Flags.kt"" into udc-qpr-dev am: dea4d8e359 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24379315 Change-Id: I8fcb314566e3fd40c1c00faf5f9522437e9afc90 Signed-off-by: Automerger Merge Worker <[email protected]>
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 92d2bd2..46f5971 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 @@ /** 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 d1a9d6bc..d1281f2 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 @@ 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