diff options
3 files changed, 16 insertions, 6 deletions
diff --git a/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml b/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml index a7b91c2b2f6a..0f210e7e5e7b 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/AndroidManifest.xml @@ -41,7 +41,7 @@ android:exported="true" android:label="@string/accessibility_menu_settings_name" android:launchMode="singleTop" - android:theme="@style/SettingsTheme"> + android:theme="@style/Theme.SettingsBase"> <intent-filter> <action android:name="android.intent.action.MAIN"/> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values/styles.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values/styles.xml index a138fa9be613..41691552f714 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values/styles.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values/styles.xml @@ -21,11 +21,6 @@ <item name="android:colorControlNormal">@color/colorControlNormal</item> </style> - <style name="SettingsTheme" parent="Theme.SettingsBase"> - <!-- Quick fix so that the preference page doesn't render under its parent header. --> - <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item> - </style> - <!--The basic theme for service and test case only--> <style name="A11yMenuBaseTheme" parent="android:Theme.DeviceDefault.Light"> <item name="android:windowActionBar">false</item> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/activity/A11yMenuSettingsActivity.java b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/activity/A11yMenuSettingsActivity.java index 129dd9b3c14d..3f7ce2c33007 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/activity/A11yMenuSettingsActivity.java +++ b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/activity/A11yMenuSettingsActivity.java @@ -21,15 +21,18 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; +import android.graphics.Insets; import android.net.Uri; import android.os.Bundle; import android.provider.Browser; import android.provider.Settings; import android.view.View; import android.view.ViewGroup; +import android.view.WindowInsets; import android.widget.TextView; import android.window.OnBackInvokedCallback; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.FragmentActivity; import androidx.preference.Preference; @@ -94,6 +97,18 @@ public class A11yMenuSettingsActivity extends FragmentActivity { super.onViewCreated(view, savedInstanceState); view.setLayoutDirection( view.getResources().getConfiguration().getLayoutDirection()); + view.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() { + @NonNull + @Override + public WindowInsets onApplyWindowInsets(@NonNull View v, + @NonNull WindowInsets windowInsets) { + Insets insets = windowInsets.getInsets(WindowInsets.Type.systemBars() + | WindowInsets.Type.navigationBars() + | WindowInsets.Type.displayCutout()); + v.setPadding(insets.left, insets.top, insets.right, insets.bottom); + return WindowInsets.CONSUMED; + } + }); } /** |