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
146 lines
4.9 KiB
Java
146 lines
4.9 KiB
Java
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
|
|
package com.android.settings.panel;
|
|
|
|
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.verify;
|
|
|
|
import android.app.settings.SettingsEnums;
|
|
import android.content.Context;
|
|
import android.net.Uri;
|
|
import android.os.Bundle;
|
|
import android.view.LayoutInflater;
|
|
import android.view.View;
|
|
import android.widget.LinearLayout;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.testutils.FakeFeatureFactory;
|
|
|
|
import org.junit.Before;
|
|
import org.junit.Test;
|
|
import org.junit.runner.RunWith;
|
|
|
|
import org.robolectric.Robolectric;
|
|
import org.robolectric.RobolectricTestRunner;
|
|
import org.robolectric.RuntimeEnvironment;
|
|
import org.robolectric.android.controller.ActivityController;
|
|
|
|
@RunWith(RobolectricTestRunner.class)
|
|
public class PanelFragmentTest {
|
|
|
|
private Context mContext;
|
|
private PanelFragment mPanelFragment;
|
|
private FakeFeatureFactory mFakeFeatureFactory;
|
|
private PanelFeatureProvider mPanelFeatureProvider;
|
|
private FakePanelContent mFakePanelContent;
|
|
|
|
private final String FAKE_EXTRA = "fake_extra";
|
|
|
|
@Before
|
|
public void setUp() {
|
|
mContext = RuntimeEnvironment.application;
|
|
|
|
mPanelFeatureProvider = spy(new PanelFeatureProviderImpl());
|
|
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
|
|
mFakeFeatureFactory.panelFeatureProvider = mPanelFeatureProvider;
|
|
mFakePanelContent = new FakePanelContent();
|
|
doReturn(mFakePanelContent).when(mPanelFeatureProvider).getPanel(any(), any(), any());
|
|
|
|
ActivityController<FakeSettingsPanelActivity> activityController =
|
|
Robolectric.buildActivity(FakeSettingsPanelActivity.class);
|
|
activityController.setup();
|
|
|
|
mPanelFragment =
|
|
spy((PanelFragment)
|
|
activityController
|
|
.get()
|
|
.getSupportFragmentManager()
|
|
.findFragmentById(R.id.main_content));
|
|
|
|
final Bundle bundle = new Bundle();
|
|
bundle.putString(SettingsPanelActivity.KEY_PANEL_TYPE_ARGUMENT, FAKE_EXTRA);
|
|
doReturn(bundle).when(mPanelFragment).getArguments();
|
|
}
|
|
|
|
@Test
|
|
public void onCreateView_countdownLatch_setup() {
|
|
mPanelFragment.onCreateView(LayoutInflater.from(mContext),
|
|
new LinearLayout(mContext), null);
|
|
PanelSlicesLoaderCountdownLatch countdownLatch =
|
|
mPanelFragment.mPanelSlicesLoaderCountdownLatch;
|
|
for (Uri sliecUri: mFakePanelContent.getSlices()) {
|
|
countdownLatch.markSliceLoaded(sliecUri);
|
|
}
|
|
|
|
assertThat(countdownLatch.isPanelReadyToLoad()).isTrue();
|
|
}
|
|
|
|
@Test
|
|
public void onCreate_logsOpenEvent() {
|
|
verify(mFakeFeatureFactory.metricsFeatureProvider).action(
|
|
0,
|
|
SettingsEnums.PAGE_VISIBLE,
|
|
mFakePanelContent.getMetricsCategory(),
|
|
null,
|
|
0);
|
|
}
|
|
|
|
@Test
|
|
public void onDestroy_logCloseEvent() {
|
|
mPanelFragment.onDestroy();
|
|
verify(mFakeFeatureFactory.metricsFeatureProvider).action(
|
|
0,
|
|
SettingsEnums.PAGE_VISIBLE,
|
|
mFakePanelContent.getMetricsCategory(),
|
|
any(String.class),
|
|
0); }
|
|
|
|
@Test
|
|
public void panelSeeMoreClick_logsCloseEvent() {
|
|
final View.OnClickListener listener = mPanelFragment.getSeeMoreListener();
|
|
|
|
listener.onClick(null);
|
|
|
|
verify(mFakeFeatureFactory.metricsFeatureProvider).action(
|
|
0,
|
|
SettingsEnums.PAGE_HIDE,
|
|
mFakePanelContent.getMetricsCategory(),
|
|
PanelLoggingContract.PanelClosedKeys.KEY_SEE_MORE,
|
|
0
|
|
);
|
|
}
|
|
|
|
@Test
|
|
public void panelDoneClick_logsCloseEvent() {
|
|
final View.OnClickListener listener = mPanelFragment.getCloseListener();
|
|
|
|
listener.onClick(null);
|
|
|
|
verify(mFakeFeatureFactory.metricsFeatureProvider).action(
|
|
0,
|
|
SettingsEnums.PAGE_HIDE,
|
|
mFakePanelContent.getMetricsCategory(),
|
|
PanelLoggingContract.PanelClosedKeys.KEY_DONE,
|
|
0
|
|
);
|
|
}
|
|
} |