summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PermissionController/res/values-v35/themes.xml2
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionsFrameFragment.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/PermissionController/res/values-v35/themes.xml b/PermissionController/res/values-v35/themes.xml
index ff6c430c4..995f230e7 100644
--- a/PermissionController/res/values-v35/themes.xml
+++ b/PermissionController/res/values-v35/themes.xml
@@ -28,7 +28,7 @@
TODO(b/309578419): Make activities handle insets properly and then remove this.
-->
<style name="OptOutEdgeToEdgeEnforcement">
- <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+ <item name="android:windowOptOutEdgeToEdgeEnforcement">false</item>
</style>
<style name="ThemeOverlay.PermissionSettings" parent="" />
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionsFrameFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionsFrameFragment.java
index af204d7d4..c1902fb57 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionsFrameFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionsFrameFragment.java
@@ -98,6 +98,9 @@ public abstract class PermissionsFrameFragment extends PreferenceFragmentCompat
com.android.settingslib.widget.progressbar.R.id.progress_bar_background);
setProgressBarVisible(false);
getListView().setFocusable(false);
+ if (SdkLevel.isAtLeastV()) {
+ rootView.setFitsSystemWindows(true);
+ }
return rootView;
}