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

Merge "Fix double divider in Privacy page"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-18 06:50:24 +00:00
committed by Android (Google) Code Review
parent 33296d6dd5 f3e3d7a46b
commit 5cb9f7801c
4 changed files with 15 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/privacy/PermissionBarChartPreferenceController.java
View File

@@ -123,10 +123,13 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
return;
}
// Add a shadow animation to action bar scroll only when the chart is available.
com.android.settings.Utils.setActionBarShadowAnimation(mParent.getActivity(),
mParent.getSettingsLifecycle(), mParent.getListView());
// We don't hide chart when we have existing data.
mBarChartPreference.updateLoadingState(mOldUsageInfos.isEmpty() /* isLoading */);
// But we still need to hint user with progress bar that we are updating new usage data.
mParent.setLoadingEnabled(true /* enabled */);
mParent.showPinnedHeader(true);
retrievePermissionUsageData();
}
@@ -162,7 +165,7 @@ public class PermissionBarChartPreferenceController extends BasePreferenceContro
}
mBarChartPreference.updateLoadingState(false /* isLoading */);
mParent.setLoadingEnabled(false /* enabled */);
mParent.showPinnedHeader(false);
}
private void retrievePermissionUsageData() {

19
src/com/android/settings/privacy/PrivacyDashboardFragment.java
View File

@@ -45,11 +45,6 @@ public class PrivacyDashboardFragment extends DashboardFragment {
private static final String KEY_NOTIFICATION_WORK_PROFILE_NOTIFICATIONS =
"privacy_lock_screen_work_profile_notifications";
@VisibleForTesting
View mProgressHeader;
@VisibleForTesting
View mProgressAnimation;
@Override
public int getMetricsCategory() {
return SettingsEnums.TOP_LEVEL_PRIVACY;
@@ -84,23 +79,13 @@ public class PrivacyDashboardFragment extends DashboardFragment {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
Utils.setActionBarShadowAnimation(getActivity(), getSettingsLifecycle(), getListView());
initLoadingBar();
}
@VisibleForTesting
void initLoadingBar() {
mProgressHeader = setPinnedHeaderView(R.layout.progress_header);
mProgressAnimation = mProgressHeader.findViewById(R.id.progress_bar_animation);
setLoadingEnabled(false);
}
@VisibleForTesting
void setLoadingEnabled(boolean enabled) {
if (mProgressHeader != null && mProgressAnimation != null) {
mProgressHeader.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
mProgressAnimation.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
}
setPinnedHeaderView(R.layout.progress_header);
showPinnedHeader(false);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(