Merge "Update action bar shadow." (0950ecf4) · Commits · e / os / android_packages_apps_PackageInstaller

PermissionController.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \
		SettingsLibLayoutPreference \
		SettingsLibActionButtonsPreference \
		SettingsLibBarChartPreference \
		SettingsLibEntityHeaderWidgets
		SettingsLibEntityHeaderWidgets \
		SettingsLibActionBarShadow

		LOCAL_STATIC_JAVA_LIBRARIES := \
		androidx.annotation_annotation

res/layout/app_permission.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		android:id="@+id/app_permission_root">

		<androidx.core.widget.NestedScrollView
		android:id="@+id/nested_scroll_view"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:clipChildren="false">

res/layout/permissions_frame.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		android:layout_height="match_parent">

		<androidx.core.widget.NestedScrollView
		android:id="@+id/nested_scroll_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ import android.widget.TextView;
		import androidx.annotation.IntDef;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.core.widget.NestedScrollView;
		import androidx.fragment.app.DialogFragment;
		import androidx.fragment.app.Fragment;

		@@ -62,6 +63,7 @@ import com.android.packageinstaller.permission.utils.Utils;
		import com.android.permissioncontroller.R;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
		import com.android.settingslib.widget.ActionBarShadowController;

		import java.lang.annotation.Retention;
		import java.util.ArrayList;
		@@ -91,6 +93,7 @@ public class AppPermissionFragment extends SettingsWithButtonHeader {
		private @NonNull View mDivider;
		private @NonNull ViewGroup mWidgetFrame;
		private @NonNull TextView mPermissionDetails;
		private @NonNull NestedScrollView mNestedScrollView;

		private boolean mHasConfirmedRevoke;

		@@ -217,6 +220,8 @@ public class AppPermissionFragment extends SettingsWithButtonHeader {
		mWidgetFrame = root.requireViewById(R.id.widget_frame);
		mPermissionDetails = root.requireViewById(R.id.permission_details);

		mNestedScrollView = root.requireViewById(R.id.nested_scroll_view);

		updateButtons();
		updateJustification(context, root, appLabel);

		@@ -267,6 +272,12 @@ public class AppPermissionFragment extends SettingsWithButtonHeader {
		activity.setResult(Activity.RESULT_CANCELED);
		activity.finish();
		}

		ActionBar ab = getActivity().getActionBar();
		if (ab != null) {
		ab.setElevation(0);
		}
		ActionBarShadowController.attachToView(activity, getLifecycle(), mNestedScrollView);
		}

		@Override

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.packageinstaller.permission.ui.handheld;

		import android.app.ActionBar;
		import android.os.Bundle;
		import android.view.LayoutInflater;
		import android.view.Menu;
		@@ -27,11 +28,13 @@ import android.view.animation.Animation.AnimationListener;
		import android.view.animation.AnimationUtils;
		import android.widget.TextView;

		import androidx.core.widget.NestedScrollView;
		import androidx.preference.PreferenceFragmentCompat;
		import androidx.recyclerview.widget.RecyclerView;

		import com.android.packageinstaller.permission.utils.Utils;
		import com.android.permissioncontroller.R;
		import com.android.settingslib.widget.ActionBarShadowController;

		public abstract class PermissionsFrameFragment extends PreferenceFragmentCompat {
		private static final String LOG_TAG = PermissionsFrameFragment.class.getSimpleName();
		@@ -45,6 +48,7 @@ public abstract class PermissionsFrameFragment extends PreferenceFragmentCompat
		private TextView mEmptyView;
		private View mLoadingView;
		private ViewGroup mPrefsView;
		private NestedScrollView mNestedScrollView;
		private boolean mIsLoading;

		/**
		@@ -78,9 +82,24 @@ public abstract class PermissionsFrameFragment extends PreferenceFragmentCompat
		inflater, mPrefsView, savedInstanceState);
		setLoading(mIsLoading, false, true /* force */);
		mPrefsView.addView(mPreferencesContainer, 0);
		mNestedScrollView = rootView.requireViewById(R.id.nested_scroll_view);
		return rootView;
		}

		@Override
		public void onStart() {
		super.onStart();

		if (mNestedScrollView != null) {
		ActionBar ab = getActivity().getActionBar();
		if (ab != null) {
		ab.setElevation(0);
		}
		ActionBarShadowController.attachToView(getActivity(), getLifecycle(),
		mNestedScrollView);
		}
		}

		@Override
		public void onCreatePreferences(Bundle bundle, String s) {
		// empty