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

Fix double divider in Privacy page

Browse Source 
The second divider is shown after we set a background to the pinned
header.

- Simply hide the pinned header instead of its inner views.
- Move setActionBarShadowAnimation to controller and just call it when
  the bar chart is available.

Fixes: 134652710
Test: robotest, visual
Change-Id: I4381e5ca1a042583d3e5874f5600719267b19786
This commit is contained in:
Jason Chiu
2019-06-14 17:24:26 +08:00
parent 5eb2c963c0
commit f3e3d7a46b
4 changed files with 15 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/robotests/src/com/android/settings/privacy/PermissionBarChartPreferenceControllerTest.java
View File

@@ -103,8 +103,7 @@ public class PermissionBarChartPreferenceControllerTest {
.create().start().get());
mController.setFragment(mFragment);
mPreference = spy(new BarChartPreference(context));
when(mScreen.findPreference(mController.getPreferenceKey()))
.thenReturn((BarChartPreference) mPreference);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@After
@@ -189,7 +188,8 @@ public class PermissionBarChartPreferenceControllerTest {
mController.onStart();
verify(mFragment).setLoadingEnabled(true /* enabled */);
assertThat(mFragment.getActivity().getActionBar().getElevation()).isZero();
verify(mFragment).showPinnedHeader(true);
verify(mPreference).updateLoadingState(true /* isLoading */);
}
@@ -205,7 +205,8 @@ public class PermissionBarChartPreferenceControllerTest {
mController.onStart();
verify(mFragment).setLoadingEnabled(true /* enabled */);
assertThat(mFragment.getActivity().getActionBar().getElevation()).isZero();
verify(mFragment).showPinnedHeader(true);
verify(mPreference).updateLoadingState(false /* isLoading */);
}
@@ -217,7 +218,8 @@ public class PermissionBarChartPreferenceControllerTest {
mController.onStart();
verify(mFragment, never()).setLoadingEnabled(true /* enabled */);
assertThat(mFragment.getActivity().getActionBar().getElevation()).isNonZero();
verify(mFragment, never()).showPinnedHeader(true);
verify(mPreference, never()).updateLoadingState(true /* isLoading */);
}
@@ -231,7 +233,7 @@ public class PermissionBarChartPreferenceControllerTest {
mController.onPermissionUsageResult(infos1);
verify(mFragment).setLoadingEnabled(false /* enabled */);
verify(mFragment).showPinnedHeader(false);
verify(mPreference).updateLoadingState(false /* isLoading */);
}

28
tests/robotests/src/com/android/settings/privacy/PrivacyDashboardFragmentTest.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.privacy;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -27,7 +25,6 @@ import android.content.Context;
import android.content.pm.UserInfo;
import android.os.Bundle;
import android.os.UserManager;
import android.permission.PermissionControllerManager;
import android.view.View;
import android.view.accessibility.AccessibilityManager;
@@ -57,8 +54,6 @@ public class PrivacyDashboardFragmentTest {
@Mock
private LockPatternUtils mLockPatternUtils;
@Mock
private PermissionControllerManager mPCM;
private Context mContext;
private PrivacyDashboardFragment mFragment;
@@ -79,33 +74,10 @@ public class PrivacyDashboardFragmentTest {
.create().start().get());
}
@Test
public void onViewCreated_shouldSetActionBarShadowAnimation() {
mFragment.onViewCreated(new View(mContext), new Bundle());
assertThat(mFragment.getActivity().getActionBar().getElevation()).isEqualTo(0.f);
}
@Test
public void onViewCreated_shouldInitLinearProgressBar() {
mFragment.onViewCreated(new View(mContext), new Bundle());
verify(mFragment).initLoadingBar();
}
@Test
public void updateLinearProgressbar_isVisible_shouldShowProgressBar() {
mFragment.setLoadingEnabled(true /* enabled */);
assertThat(mFragment.mProgressHeader.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(mFragment.mProgressAnimation.getVisibility()).isEqualTo(View.VISIBLE);
}
@Test
public void updateLinearProgressbar_isInVisible_shouldHideProgressBar() {
mFragment.setLoadingEnabled(false /* enabled */);
assertThat(mFragment.mProgressHeader.getVisibility()).isEqualTo(View.INVISIBLE);
assertThat(mFragment.mProgressAnimation.getVisibility()).isEqualTo(View.INVISIBLE);
}
}