Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 288f1ebf authored Apr 01, 2019 by Joel Galenson

Ensure the dashboard header remains after pressing back.

Fixes: 129695818
Test: Open dashboard, change filters, go back.
Test: Open other screens that use the header, navigate somewhere, go
back.

Change-Id: Id3a25bd83bdb950143b6683a1e87b9035c273c63

parent bc678fde

src/com/android/packageinstaller/permission/ui/handheld/PermissionUsageFragment.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -201,8 +201,6 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements
		public void onStart() {
		super.onStart();
		getActivity().setTitle(R.string.permission_usage_title);

		hideHeader();
		}

		/**
		@@ -429,6 +427,7 @@ public class PermissionUsageFragment extends SettingsWithLargeHeader implements
		// Update header.
		if (mFilterGroup == null) {
		screen.addPreference(createBarChart(usages, timeFilterItem, context));
		hideHeader();
		} else {
		AppPermissionGroup group = getGroup(mFilterGroup);
		if (group != null) {

src/com/android/packageinstaller/permission/ui/handheld/SettingsWithLargeHeader.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,15 @@ public abstract class SettingsWithLargeHeader extends PermissionsFrameFragment
		ViewGroup root = (ViewGroup) super.onCreateView(inflater, container, savedInstanceState);

		if (!DeviceUtils.isTelevision(getContext())) {
		if (mHeader == null) {
		mHeader = inflater.inflate(R.layout.header_large, root, false);
		getPreferencesContainer().addView(mHeader, 0);
		} else if (mHeader.getVisibility() == View.VISIBLE) {
		((ViewGroup) mHeader.getParent()).removeView(mHeader);
		getPreferencesContainer().addView(mHeader, 0);
		updateHeader(mHeader);
		mHeader.requireViewById(R.id.header_link).setVisibility(View.VISIBLE);
		}
		}

		return root;