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

Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3 am: 3ce2aaf7b5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349

Change-Id: I9180a7d2471436b9619ceaafac0ad945ac4ce16a
This commit is contained in:
TreeHugger Robot
2021-06-16 11:45:12 +00:00
committed by Automerger Merge Worker
parent eed6676e5c 3ce2aaf7b5
commit cbcd1e663e
7 changed files with 2 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
View File

@@ -37,7 +37,6 @@ import android.content.pm.ActivityInfo;
import android.content.pm.ProviderInfo;
import android.net.Uri;
import android.os.Bundle;
import android.util.FeatureFlagUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
@@ -46,7 +45,6 @@ import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.slices.BlockingSlicePrefController;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -335,37 +333,6 @@ public class DashboardFragmentTest {
assertThat(pref).isInstanceOf(PrimarySwitchPreference.class);
}
@Test
public void isFeatureFlagAndIsParalleled_runParalleledUpdatePreferenceStates() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.CONTROLLER_ENHANCEMENT, true);
final TestFragment testFragment = spy(new TestFragment(RuntimeEnvironment.application));
testFragment.updatePreferenceStates();
verify(testFragment).updatePreferenceStatesInParallel();
}
@Test
public void notFeatureFlagAndIsParalleled_notRunParalleledUpdatePreferenceStates() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.CONTROLLER_ENHANCEMENT, false);
final TestFragment testFragment = spy(new TestFragment(RuntimeEnvironment.application));
testFragment.updatePreferenceStates();
verify(testFragment, never()).updatePreferenceStatesInParallel();
}
@Test
public void isFeatureFlagAndNotParalleled_notRunParalleledUpdatePreferenceStates() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.CONTROLLER_ENHANCEMENT, true);
final TestFragment testFragment = spy(new TestFragment(RuntimeEnvironment.application));
testFragment.setUsingControllerEnhancement(false);
testFragment.updatePreferenceStates();
verify(testFragment, never()).updatePreferenceStatesInParallel();
}
public static class TestPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {