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

Show shadow when entity header starts scrolling.

Browse Source 
- Add a controller to manage add/remove onScrollChangedListener to
  recyclerviews.
- When recyclerview on each screen is scrolled to top, set actionbar
  elevation to 0, otherwise set it to non-zero.
- When screen is moved to background, detach the listener.
- Use the controller in entity header.

Change-Id: Iecf194d885098c98c392810f62893ae9189f3936
Fix: 37670670
Test: make RunSettingsRoboTests
This commit is contained in:
Fan Zhang
2017-05-22 09:50:38 -07:00
parent 7983dba5f6
commit 841d1d5aab
18 changed files with 277 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
View File

@@ -18,10 +18,10 @@ package com.android.settings.accounts;
import android.accounts.Account;
import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
import android.support.v14.preference.PreferenceFragment;
import android.support.v7.preference.PreferenceScreen;
import android.widget.TextView;
@@ -31,6 +31,7 @@ import com.android.settings.TestConfig;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Test;
@@ -57,7 +58,7 @@ public class AccountHeaderPreferenceControllerTest {
@Mock
private Activity mActivity;
@Mock
private Fragment mFragment;
private PreferenceFragment mFragment;
@Mock
private PreferenceScreen mScreen;
@@ -76,7 +77,7 @@ public class AccountHeaderPreferenceControllerTest {
@Test
public void isAvailable_noArgs_shouldReturnNull() {
mController = new AccountHeaderPreferenceController(RuntimeEnvironment.application,
mActivity, mFragment, null /* args */);
new Lifecycle(), mActivity, mFragment, null /* args */);
assertThat(mController.isAvailable()).isFalse();
}
@@ -89,7 +90,7 @@ public class AccountHeaderPreferenceControllerTest {
args.putParcelable(AccountDetailDashboardFragment.KEY_ACCOUNT, account);
args.putParcelable(AccountDetailDashboardFragment.KEY_USER_HANDLE, UserHandle.CURRENT);
mController = new AccountHeaderPreferenceController(RuntimeEnvironment.application,
mActivity, mFragment, args);
new Lifecycle(), mActivity, mFragment, args);
assertThat(mController.isAvailable()).isTrue();

4
tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
View File

@@ -42,11 +42,13 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
@@ -74,6 +76,8 @@ public class AppDataUsageTest {
@Test
public void bindAppHeader_allWorkApps_shouldNotShowAppInfoLink() {
ShadowEntityHeaderController.setUseMock(mHeaderController);
when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
mFragment = spy(new AppDataUsage());
doReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS))

4
tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
View File

@@ -23,6 +23,7 @@ import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.os.BatteryStats;
import android.os.Bundle;
import android.support.v7.widget.RecyclerView;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
@@ -36,6 +37,7 @@ import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.After;
import org.junit.Before;
@@ -122,6 +124,8 @@ public class AdvancedPowerUsageDetailTest {
doReturn(mBundle).when(mFragment).getArguments();
ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
doReturn(mEntityHeaderController).when(mEntityHeaderController)
.setRecyclerView(any(RecyclerView.class), any(Lifecycle.class));
doReturn(mEntityHeaderController).when(mEntityHeaderController)
.setButtonActions(anyInt(), anyInt());
doReturn(mEntityHeaderController).when(mEntityHeaderController)

4
tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java
View File

@@ -16,8 +16,8 @@
package com.android.settings.testutils.shadow;
import android.app.Activity;
import android.app.Fragment;
import android.content.Context;
import android.view.View;
import com.android.settings.widget.EntityHeaderController;
@@ -41,7 +41,7 @@ public class ShadowEntityHeaderController {
}
@Implementation
public static EntityHeaderController newInstance(Context context, Fragment fragment,
public static EntityHeaderController newInstance(Activity activity, Fragment fragment,
View header) {
return sMockController;
}

89
tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java Normal file
View File

@@ -0,0 +1,89 @@
/*
* Copyright (C) 2017 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.widget;
import android.app.ActionBar;
import android.app.Activity;
import android.support.v7.widget.RecyclerView;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.List;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ActionBarShadowControllerTest {
@Mock
private RecyclerView mRecyclerView;
@Mock
private Activity mActivity;
@Mock
private ActionBar mActionBar;
private Lifecycle mLifecycle;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mActivity.getActionBar()).thenReturn(mActionBar);
mLifecycle = new Lifecycle();
}
@Test
public void attachToRecyclerView_shouldAddScrollWatcherAndUpdateActionBar() {
when(mRecyclerView.canScrollVertically(-1)).thenReturn(false);
ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
verify(mActionBar).setElevation(0);
}
@Test
public void attachToRecyclerView_lifecycleChange_shouldAttachDetach() {
ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
List<LifecycleObserver> observers = ReflectionHelpers.getField(mLifecycle, "mObservers");
assertThat(observers).hasSize(1);
verify(mRecyclerView).addOnScrollListener(any());
mLifecycle.onStop();
verify(mRecyclerView).removeOnScrollListener(any());
mLifecycle.onStart();
verify(mRecyclerView, times(2)).addOnScrollListener(any());
}
}

38
tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
View File

@@ -66,7 +66,6 @@ public class EntityHeaderControllerTest {
@Mock
private Fragment mFragment;
private FakeFeatureFactory mFeatureFactory;
private Context mShadowContext;
private LayoutInflater mLayoutInflater;
private PackageInfo mInfo;
@@ -76,8 +75,8 @@ public class EntityHeaderControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mContext);
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mShadowContext = RuntimeEnvironment.application;
when(mActivity.getApplicationContext()).thenReturn(mShadowContext);
when(mContext.getApplicationContext()).thenReturn(mContext);
when(mFragment.getContext()).thenReturn(mShadowContext);
mLayoutInflater = LayoutInflater.from(mShadowContext);
@@ -87,7 +86,7 @@ public class EntityHeaderControllerTest {
@Test
public void testBuildView_constructedWithoutView_shouldCreateNewView() {
mController = EntityHeaderController.newInstance(mShadowContext, mFragment, null);
mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
View view = mController.done(mActivity);
assertThat(view).isNotNull();
@@ -95,7 +94,7 @@ public class EntityHeaderControllerTest {
@Test
public void testBuildView_withContext_shouldBuildPreference() {
mController = EntityHeaderController.newInstance(mShadowContext, mFragment, null);
mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
Preference preference = mController.done(mActivity, mShadowContext);
assertThat(preference instanceof LayoutPreference).isTrue();
@@ -104,7 +103,7 @@ public class EntityHeaderControllerTest {
@Test
public void testBuildView_constructedWithView_shouldReturnSameView() {
View inputView = mLayoutInflater.inflate(R.layout.settings_entity_header, null /* root */);
mController = EntityHeaderController.newInstance(mShadowContext, mFragment, inputView);
mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView);
View view = mController.done(mActivity);
assertThat(view).isSameAs(inputView);
@@ -118,7 +117,7 @@ public class EntityHeaderControllerTest {
final TextView label = header.findViewById(R.id.entity_header_title);
final TextView version = header.findViewById(R.id.entity_header_summary);
mController = EntityHeaderController.newInstance(mShadowContext, mFragment, header);
mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
mController.setLabel(testString);
mController.setSummary(testString);
mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
@@ -136,10 +135,11 @@ public class EntityHeaderControllerTest {
info.activityInfo.name = "321";
final View appLinks = mLayoutInflater
.inflate(R.layout.settings_entity_header, null /* root */);
when(mActivity.getApplicationContext()).thenReturn(mContext);
when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
.thenReturn(info);
mController = EntityHeaderController.newInstance(mContext, mFragment, appLinks);
mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
mController.setButtonActions(
EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
EntityHeaderController.ActionType.ACTION_NONE);
@@ -164,7 +164,7 @@ public class EntityHeaderControllerTest {
when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
.thenReturn(null);
mController = EntityHeaderController.newInstance(mContext, mFragment, appLinks);
mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
mController.setButtonActions(
EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
EntityHeaderController.ActionType.ACTION_NONE);
@@ -181,7 +181,7 @@ public class EntityHeaderControllerTest {
final View appLinks = mLayoutInflater
.inflate(R.layout.settings_entity_header, null /* root */);
mController = EntityHeaderController.newInstance(mContext, mFragment, appLinks);
mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
mController.setPackageName(null)
.setButtonActions(
EntityHeaderController.ActionType.ACTION_APP_INFO,
@@ -200,7 +200,7 @@ public class EntityHeaderControllerTest {
.inflate(R.layout.settings_entity_header, null /* root */);
when(mFragment.getActivity()).thenReturn(mock(Activity.class));
mController = EntityHeaderController.newInstance(mContext, mFragment, appLinks);
mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
mController.setPackageName("123")
.setUid(UserHandle.USER_SYSTEM)
.setButtonActions(
@@ -221,7 +221,7 @@ public class EntityHeaderControllerTest {
when(mFragment.getActivity()).thenReturn(mock(Activity.class));
when(mContext.getString(eq(R.string.application_info_label))).thenReturn("App Info");
mController = EntityHeaderController.newInstance(mContext, mFragment, appLinks);
mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
mController.setPackageName("123")
.setUid(UserHandle.USER_SYSTEM)
.setButtonActions(
@@ -229,8 +229,8 @@ public class EntityHeaderControllerTest {
EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
mController.done(mActivity);
assertThat(appLinks.findViewById(android.R.id.button1).getContentDescription())
.isEqualTo("App Info");
assertThat(appLinks.findViewById(android.R.id.button1).getContentDescription().toString())
.isEqualTo("App info");
}
@Test
@@ -238,7 +238,7 @@ public class EntityHeaderControllerTest {
final View appLinks = mLayoutInflater
.inflate(R.layout.settings_entity_header, null /* root */);
mController = EntityHeaderController.newInstance(mContext, mFragment, appLinks);
mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
mController.setAppNotifPrefIntent(new Intent())
.setButtonActions(
EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
@@ -257,7 +257,7 @@ public class EntityHeaderControllerTest {
public void instantApps_normalAppsDontGetLabel() {
final View header = mLayoutInflater.inflate(
R.layout.settings_entity_header, null /* root */);
mController = EntityHeaderController.newInstance(mContext, mFragment, header);
mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
mController.done(mActivity);
assertThat(header.findViewById(R.id.install_type).getVisibility())
@@ -269,7 +269,7 @@ public class EntityHeaderControllerTest {
public void instantApps_expectedHeaderItem() {
final View header = mLayoutInflater.inflate(
R.layout.settings_entity_header, null /* root */);
mController = EntityHeaderController.newInstance(mContext, mFragment, header);
mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
mController.setIsInstantApp(true);
mController.done(mActivity);
TextView label = header.findViewById(R.id.install_type);
@@ -283,7 +283,7 @@ public class EntityHeaderControllerTest {
@Test
public void styleActionBar_invalidObjects_shouldNotCrash() {
mController = EntityHeaderController.newInstance(mShadowContext, mFragment, null);
mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
mController.styleActionBar(null);
when(mActivity.getActionBar()).thenReturn(null);
@@ -296,7 +296,7 @@ public class EntityHeaderControllerTest {
public void styleActionBar_setElevationAndBackground() {
final ActionBar actionBar = mActivity.getActionBar();
mController = EntityHeaderController.newInstance(mShadowContext, mFragment, null);
mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
mController.styleActionBar(mActivity);
verify(actionBar).setElevation(0);
@@ -307,7 +307,7 @@ public class EntityHeaderControllerTest {
@Test
public void initAppHeaderController_appHeaderNull_useFragmentContext() {
mController = EntityHeaderController.newInstance(mContext, mFragment, null);
mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
// Fragment.getContext() is invoked to inflate the view
verify(mFragment).getContext();