diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2019-08-15 16:03:32 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-15 16:03:32 -0700 |
commit | 27df700f056d88e38e913bc40ca0936fa420cd25 (patch) | |
tree | 36e2f0f92131bcfe7bfd76d37bd3598c39382e75 /robolectric_tests | |
parent | 84245e84c800343d1498f08a7c3d73815b740a69 (diff) | |
parent | 96eba3aea67dae6211ef0c3ac9fba807899cda5e (diff) | |
download | packages_apps_Trebuchet-27df700f056d88e38e913bc40ca0936fa420cd25.tar.gz packages_apps_Trebuchet-27df700f056d88e38e913bc40ca0936fa420cd25.tar.bz2 packages_apps_Trebuchet-27df700f056d88e38e913bc40ca0936fa420cd25.zip |
Merge "Make TogglableFlag backed by DeviceConfig for e2e testing" into ub-launcher3-qt-qpr1-dev
am: 96eba3aea6
Change-Id: I738256f1623119a61197c03008e098b066161542
Diffstat (limited to 'robolectric_tests')
-rw-r--r-- | robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java b/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java index 92bcc6434..a3d121676 100644 --- a/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java +++ b/robolectric_tests/src/com/android/launcher3/config/FlagOverrideRule.java @@ -1,6 +1,8 @@ package com.android.launcher3.config; +import com.android.launcher3.config.BaseFlags.BaseTogglableFlag; +import com.android.launcher3.uioverrides.TogglableFlag; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; @@ -70,7 +72,7 @@ public final class FlagOverrideRule implements TestRule { }; } - private void override(BaseFlags.TogglableFlag flag, boolean newValue) { + private void override(BaseTogglableFlag flag, boolean newValue) { if (!ruleInProgress) { throw new IllegalStateException( "Rule isn't in progress. Did you remember to mark it with @Rule?"); @@ -93,7 +95,7 @@ public final class FlagOverrideRule implements TestRule { private void applyAnnotation(FlagOverride flagOverride) { boolean found = false; - for (BaseFlags.TogglableFlag flag : FeatureFlags.getTogglableFlags()) { + for (TogglableFlag flag : FeatureFlags.getTogglableFlags()) { if (flag.getKey().equals(flagOverride.key())) { override(flag, flagOverride.value()); found = true; @@ -109,7 +111,7 @@ public final class FlagOverrideRule implements TestRule { * Resets all flags to their default values. */ private void clearOverrides() { - for (BaseFlags.TogglableFlag flag : FeatureFlags.getTogglableFlags()) { + for (BaseTogglableFlag flag : FeatureFlags.getTogglableFlags()) { flag.setForTests(flag.getDefaultValue()); } } |