Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b4f01e4 authored by Raff Tsai's avatar Raff Tsai Committed by Android (Google) Code Review
Browse files

Merge "Fix feature flag page animation"

parents cf596519 b3b6236e
Loading
Loading
Loading
Loading
+4 −11
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;

import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;

import java.util.Map;

public class FeatureFlagsPreferenceController extends BasePreferenceController
        implements LifecycleObserver, OnStart {
/**
 * A {@link BasePreferenceController} used in {@link FeatureFlagsDashboard}
 */
public class FeatureFlagsPreferenceController extends BasePreferenceController {

    private PreferenceGroup mGroup;

@@ -47,13 +47,6 @@ public class FeatureFlagsPreferenceController extends BasePreferenceController
    public void displayPreference(PreferenceScreen screen) {
        super.displayPreference(screen);
        mGroup = screen.findPreference(getPreferenceKey());
    }

    @Override
    public void onStart() {
        if (mGroup == null) {
            return;
        }
        final Map<String, String> featureMap = FeatureFlagUtils.getAllFeatureFlags();
        if (featureMap == null) {
            return;
+1 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.when;

import android.content.Context;
import android.os.Build;
import android.os.SystemProperties;

import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
@@ -77,9 +76,8 @@ public class FeatureFlagPreferenceControllerTest {

    @Test
    public void onStart_shouldRefreshFeatureFlags() {
        mController.onStart();
        mController.displayPreference(mScreen);

        verify(mCategory).removeAll();
        verify(mCategory, atLeastOnce()).addPreference(any(FeatureFlagPreference.class));
    }
}