Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a42acc83 authored by Hui Wang's avatar Hui Wang
Browse files

Make EnableAccountPreference support edge to edge

Flag: EXEMPT bug fix
Bug: 398067173
Test: manual
Change-Id: I98de5d6485ceeb3447baab787b663f9e6cb59cd4
parent cb48ac65
Loading
Loading
Loading
Loading
+1 −20
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public class BlockedNumbersActivity extends ListActivity
            // set the talkback voice prompt to "Back" instead of "Navigate Up"
            actionBar.setHomeActionContentDescription(R.string.back);
        }
        setupEdgeToEdge(this);
        SettingsConstants.setupEdgeToEdge(this);

        if (!BlockedNumberContract.canCurrentUserBlockNumbers(this)) {
            TextView nonPrimaryUserText = (TextView) findViewById(R.id.non_primary_user);
@@ -364,23 +364,4 @@ public class BlockedNumbersActivity extends ListActivity
        }
        mAddButton.setEnabled(true);
    }

    /**
     * Given an activity, configure the activity to adjust for edge to edge restrictions.
     * @param activity the activity.
     */
    public static void setupEdgeToEdge(Activity activity) {
        ViewCompat.setOnApplyWindowInsetsListener(activity.findViewById(android.R.id.content),
                (v, windowInsets) -> {
                    Insets insets = windowInsets.getInsets(
                            WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime());

                    // Apply the insets paddings to the view.
                    v.setPadding(insets.left, insets.top, insets.right, insets.bottom);

                    // Return CONSUMED if you don't want the window insets to keep being
                    // passed down to descendant views.
                    return WindowInsetsCompat.CONSUMED;
                });
    }
}
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ public class EnableAccountPreferenceActivity extends Activity {
        if (actionBar != null) {
            actionBar.setDisplayHomeAsUpEnabled(true);
        }
        SettingsConstants.setupEdgeToEdge(this);
    }

    /** ${inheritDoc} */
+43 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2025 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.android.server.telecom.settings;

import android.app.Activity;

import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;

public class SettingsConstants {
    /**
     * Given an activity, configure the activity to adjust for edge to edge restrictions.
     * @param activity the activity.
     */
    public static void setupEdgeToEdge(Activity activity) {
        ViewCompat.setOnApplyWindowInsetsListener(activity.findViewById(android.R.id.content),
            (v, windowInsets) -> {
                Insets insets = windowInsets.getInsets(
                    WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime());

                // Apply the insets paddings to the view.
                v.setPadding(insets.left, insets.top, insets.right, insets.bottom);

                // Return CONSUMED if you don't want the window insets to keep being
                // passed down to descendant views.
                return WindowInsetsCompat.CONSUMED;
            });
    }
}