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

Commit 7fbd30ed authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2481491, 2481800, 2481782, 2481665, 2481547, 2481358,... 

Merge cherrypicks of [2481491, 2481800, 2481782, 2481665, 2481547, 2481358, 2481802, 2481613, 2481668, 2481614, 2481594, 2481595, 2481548, 2481744, 2481493, 2481494, 2481709] into oc-release

Change-Id: Ie9bbb629b1cc534f289d3bb3e649cc4e0c0f0c97
parents 9bfcbe30 a41f5571

core/java/android/view/View.java

+2 −0
Original line number Diff line number Diff line
@@ -724,6 +724,8 @@ import java.util.function.Predicate; 
 * @attr ref android.R.styleable#View_nextFocusUp

 * @attr ref android.R.styleable#View_onClick

 * @attr ref android.R.styleable#View_padding

 * @attr ref android.R.styleable#View_paddingHorizontal

 * @attr ref android.R.styleable#View_paddingVertical

 * @attr ref android.R.styleable#View_paddingBottom

 * @attr ref android.R.styleable#View_paddingLeft

 * @attr ref android.R.styleable#View_paddingRight

core/java/android/view/ViewGroup.java

+10 −0
Original line number Diff line number Diff line
@@ -7608,6 +7608,16 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
     * See

     * {@link android.R.styleable#ViewGroup_MarginLayout ViewGroup Margin Layout Attributes}

     * for a list of all child view attributes that this class supports.

     *

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_margin

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginHorizontal

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginVertical

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginLeft

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginTop

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginRight

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginBottom

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginStart

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginEnd

     */

    public static class MarginLayoutParams extends ViewGroup.LayoutParams {

        /**

core/java/android/view/autofill/AutofillManager.java

+2 −1
Original line number Diff line number Diff line
@@ -741,7 +741,8 @@ public final class AutofillManager { 
    }



    /**

     * Returns {@code true} if Autofill is supported for this user.

     * Returns {@code true} if autofill is supported by the current device and

     * is supported for this user.

     *

     * <p>Autofill is typically supported, but it could be unsupported in cases like:

     * <ol>

core/java/com/android/internal/policy/PhoneWindow.java

+17 −0
Original line number Diff line number Diff line
@@ -3102,6 +3102,18 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
        }

    }



    /**

     * Check if Setup or Post-Setup update is completed on TV

     * @return true if completed

     */

    private boolean isTvUserSetupComplete() {

        boolean isTvSetupComplete = Settings.Secure.getInt(getContext().getContentResolver(),

                Settings.Secure.USER_SETUP_COMPLETE, 0) != 0;

        isTvSetupComplete &= Settings.Secure.getInt(getContext().getContentResolver(),

                Settings.Secure.TV_USER_SETUP_COMPLETE, 0) != 0;

        return isTvSetupComplete;

    }



    /**

     * Helper method for adding launch-search to most applications. Opens the

     * search window using default settings.
@@ -3109,6 +3121,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
     * @return true if search window opened

     */

    private boolean launchDefaultSearch(KeyEvent event) {

        if (getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)

                && !isTvUserSetupComplete()) {

            // If we are in Setup or Post-Setup update mode on TV, consume the search key

            return false;

        }

        boolean result;

        final Callback cb = getCallback();

        if (cb == null || isDestroyed()) {

services/core/java/com/android/server/policy/PhoneWindowManager.java

+10 −1
Original line number Diff line number Diff line
@@ -1689,8 +1689,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    boolean isUserSetupComplete() {

        return Settings.Secure.getIntForUser(mContext.getContentResolver(),

        boolean isSetupComplete = Settings.Secure.getIntForUser(mContext.getContentResolver(),

                Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;

        if (mHasFeatureLeanback) {

            isSetupComplete &= isTvUserSetupComplete();

        }

        return isSetupComplete;

    }



    private boolean isTvUserSetupComplete() {

        return Settings.Secure.getIntForUser(mContext.getContentResolver(),

                Settings.Secure.TV_USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;

    }



    private void handleShortPressOnHome() {