diff options
| author | 2025-01-14 18:01:16 -0800 | |
|---|---|---|
| committer | 2025-01-17 15:28:01 -0800 | |
| commit | a031c09542b0bff012c426df67edab9505864d88 (patch) | |
| tree | b820650e1527968ccf8de432b63cd0de4409d957 | |
| parent | 35cf8629a506f8594a7700f455a761137e879dfe (diff) | |
[E2E] Enable edge-to-edge (and enable fitsSystemWindows)
Enable edge-to-edge in PermissionController after fixing an issue:
On handheld, when enabling edge-to-edge (go/e2e-2024-1p) in the
Permission module, the system navigation bar seems to have incorrect
bottom-padding. This is resolved by setting
android:fitsSystemWindows="true" on the root layout used by
PermissionsFrameFragment (permissions_frame.xml).
Bug: 380055900
Test: atest CtsPermissionUiTestCases
Relnote: N/A
Flag: EXEMPT bugfix
LOW_COVERAGE_REASON=NON_CODE_ONLY
Change-Id: Ia20eee98b58701704937f81f6d114d91c82f1c45
| -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; } |