Fix feature flag page animation
- Move add preference code to displayPreference() Fixes: 143192095 Test: manual Change-Id: Ib735ecd11fec6a3d45c9743577ea309755d6b010
This commit is contained in:
@@ -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;
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user