| commit | 63585f73616efc44755bd9359d3c723a111d67c4 | [log] [tgz] |
|---|---|---|
| author | George Lin <giolin@google.com> | Mon Nov 14 21:12:21 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 14 21:12:21 2022 +0000 |
| tree | 5c6570cc16e237e635cd4827dc0711a0ced52164 | |
| parent | c3dd9ed399a1efb36514b7241cafc5ac596a6aab [diff] | |
| parent | f567ba20beb8417a572ec2717200dace6d374d7c [diff] |
Merge "[TP] Change custom clocks flag name" into tm-qpr-dev am: 802e8ed174 am: f567ba20be Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/20455266 Change-Id: I2ec0e2c67421ae0bb152cd2469ff63c9b7ad5863 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/customization/model/clock/ClockSectionController.java b/src/com/android/customization/model/clock/ClockSectionController.java index 8f98b88..285b5b7 100644 --- a/src/com/android/customization/model/clock/ClockSectionController.java +++ b/src/com/android/customization/model/clock/ClockSectionController.java
@@ -37,7 +37,7 @@ @Override public boolean isAvailable(@Nullable Context context) { - return Flags.enableClockCustomization; + return Flags.enableCustomClocks; } @Override
diff --git a/src_override/com/android/wallpaper/config/Flags.java b/src_override/com/android/wallpaper/config/Flags.java index 76549cb..42731de 100644 --- a/src_override/com/android/wallpaper/config/Flags.java +++ b/src_override/com/android/wallpaper/config/Flags.java
@@ -16,5 +16,5 @@ package com.android.wallpaper.config; public class Flags extends BaseFlags { - public static boolean enableClockCustomization = false; + public static boolean enableCustomClocks = false; }