diff options
| author | 2025-01-17 16:18:10 -0800 | |
|---|---|---|
| committer | 2025-01-17 16:18:10 -0800 | |
| commit | 9cb2450013fa4f84f408490ba9c341b8319d9c21 (patch) | |
| tree | e75bcddff1c79722209705aa682ac0627dcb66e5 | |
| parent | 11d0582880625dbe7fd7fc788d88957fcff036c8 (diff) | |
| parent | a031c09542b0bff012c426df67edab9505864d88 (diff) | |
Merge "[E2E] Enable edge-to-edge (and enable fitsSystemWindows)" into main
| -rw-r--r-- | PermissionController/res/values-v35/themes.xml | 2 | ||||
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionsFrameFragment.java | 3 |
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; } |