Add entry animation to Settings Panels.
Settings Panels as a dialog have a default animation for entering the screen, but Slices complicate the animation. While the dialog enters the screen, Slices begin to bind, thus changing the height of the dialog as it enters, causing perceived bounce / jank in the animation. This CL is cherry-picked/based on ag/6671083 but do the following modification: (See the original commit message for the whole concept) When trying to load all the Slices, there are few possible situations: 1. Slice starts loading slowly, starting at state LOADED_NONE 2. Slice is loading in progress, having state LOADED_PARTIAL 3. Slice is loaded, but there's error return from the Slice data (We don't need to show the Slice in this case) 4. Slice is loaded, progress to state LOADED_ALL 5. Slice starts from state LOADED_NONE, but never progress to the next state because it crashes at setting backend. Notice that there are two cases that the state will stay at LOADED_NONE and we can't distinguish them. Hence, we decide to do the following: If Slice is with error (case 3) we remove the slice from the list and mark it loaded. If Slice is loaded with LOADED_ALL (case 4, which is the ideal case), we mark it as loaded. In the other cases, we fire a handler to mark the slice loaded anyway after 250ms timeout. When all the slices are marked loaded (which should happen after 250ms timeout, we will animate the panel out. Although there might be slices which are still partial loaded, we can still have the slice in the panel once it is ready. The panel might bounce/jank in this case, but at least it will still showing correctly, and should show up smoothly in most cases. The solution to this problem is twofold: 1. Load all Slices first 2. Create a custom animation to draw the panel once the recyclerview has been laid out. Test: Manual/Visual inspection Test: make -j40 RunSettingsRobotests Bug: 123942159 Change-Id: I639a707aa4ba3f906bd6f9752c92727aaba28142
This commit is contained in:
committed by
Linda Tseng
parent
80584fe1f7
commit
b6fdd25c23
@@ -23,41 +23,53 @@ import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.FrameLayout;
|
||||
|
||||
import androidx.lifecycle.LiveData;
|
||||
import androidx.slice.Slice;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.slices.CustomSliceRegistry;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.Robolectric;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.Robolectric;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.android.controller.ActivityController;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class PanelSlicesAdapterTest {
|
||||
|
||||
private static final Uri DATA_URI = CustomSliceRegistry.DATA_USAGE_SLICE_URI;
|
||||
|
||||
private Context mContext;
|
||||
private PanelFragment mPanelFragment;
|
||||
private FakePanelContent mFakePanelContent;
|
||||
private FakeFeatureFactory mFakeFeatureFactory;
|
||||
private PanelFeatureProvider mPanelFeatureProvider;
|
||||
private FakeFeatureFactory mFakeFeatureFactory;
|
||||
private FakePanelContent mFakePanelContent;
|
||||
private List<LiveData<Slice>> mData = new ArrayList<>();
|
||||
|
||||
@Mock
|
||||
private LiveData<Slice> mLiveData;
|
||||
|
||||
private Slice mSlice;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
|
||||
mPanelFeatureProvider = spy(new PanelFeatureProviderImpl());
|
||||
@@ -76,12 +88,22 @@ public class PanelSlicesAdapterTest {
|
||||
.get()
|
||||
.getSupportFragmentManager()
|
||||
.findFragmentById(R.id.main_content));
|
||||
|
||||
}
|
||||
|
||||
private void constructTestLiveData(Uri uri) {
|
||||
// Create a slice to return for the LiveData
|
||||
mSlice = spy(new Slice());
|
||||
doReturn(uri).when(mSlice).getUri();
|
||||
when(mLiveData.getValue()).thenReturn(mSlice);
|
||||
mData.add(mLiveData);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onCreateViewHolder_returnsSliceRowViewHolder() {
|
||||
constructTestLiveData(DATA_URI);
|
||||
final PanelSlicesAdapter adapter =
|
||||
new PanelSlicesAdapter(mPanelFragment, mFakePanelContent);
|
||||
new PanelSlicesAdapter(mPanelFragment, mData, 0 /* metrics category */);
|
||||
final ViewGroup view = new FrameLayout(mContext);
|
||||
final PanelSlicesAdapter.SliceRowViewHolder viewHolder =
|
||||
adapter.onCreateViewHolder(view, 0);
|
||||
@@ -89,24 +111,11 @@ public class PanelSlicesAdapterTest {
|
||||
assertThat(viewHolder.sliceView).isNotNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onBindViewHolder_bindsSlice() {
|
||||
final PanelSlicesAdapter adapter =
|
||||
new PanelSlicesAdapter(mPanelFragment, mFakePanelContent);
|
||||
final int position = 0;
|
||||
final ViewGroup view = new FrameLayout(mContext);
|
||||
final PanelSlicesAdapter.SliceRowViewHolder viewHolder =
|
||||
adapter.onCreateViewHolder(view, 0 /* view type*/);
|
||||
|
||||
adapter.onBindViewHolder(viewHolder, position);
|
||||
|
||||
assertThat(viewHolder.sliceLiveData).isNotNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void nonMediaOutputIndicatorSlice_shouldAllowDividerAboveAndBelow() {
|
||||
constructTestLiveData(DATA_URI);
|
||||
final PanelSlicesAdapter adapter =
|
||||
new PanelSlicesAdapter(mPanelFragment, mFakePanelContent);
|
||||
new PanelSlicesAdapter(mPanelFragment, mData, 0 /* metrics category */);
|
||||
final int position = 0;
|
||||
final ViewGroup view = new FrameLayout(mContext);
|
||||
final PanelSlicesAdapter.SliceRowViewHolder viewHolder =
|
||||
@@ -120,32 +129,10 @@ public class PanelSlicesAdapterTest {
|
||||
|
||||
@Test
|
||||
public void mediaOutputIndicatorSlice_shouldNotAllowDividerAbove() {
|
||||
PanelContent mediaOutputIndicatorSlicePanelContent = new PanelContent() {
|
||||
@Override
|
||||
public CharSequence getTitle() {
|
||||
return "title";
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Uri> getSlices() {
|
||||
return Arrays.asList(
|
||||
MEDIA_OUTPUT_INDICATOR_SLICE_URI
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Intent getSeeMoreIntent() {
|
||||
return new Intent();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return SettingsEnums.TESTING;
|
||||
}
|
||||
};
|
||||
constructTestLiveData(MEDIA_OUTPUT_INDICATOR_SLICE_URI);
|
||||
|
||||
final PanelSlicesAdapter adapter =
|
||||
new PanelSlicesAdapter(mPanelFragment, mediaOutputIndicatorSlicePanelContent);
|
||||
new PanelSlicesAdapter(mPanelFragment, mData, 0 /* metrics category */);
|
||||
final int position = 0;
|
||||
final ViewGroup view = new FrameLayout(mContext);
|
||||
final PanelSlicesAdapter.SliceRowViewHolder viewHolder =
|
||||
|
Reference in New Issue
Block a user