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

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

Snap for 6809626 from 65f41278 to rvc-qpr1-release 

Change-Id: I05e00a366e1cf71da8435776d33aeabcc8a041d0
parents 5faa3e8b 65f41278

core/java/android/view/ViewRootImpl.java

+17 −14
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_APPEARANCE_CO 
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_BEHAVIOR_CONTROLLED;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FIT_INSETS_CONTROLLED;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DECOR_VIEW_VISIBILITY;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_INSET_PARENT_FRAME_BY_IME;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST;

import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;

import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
@@ -1449,14 +1452,13 @@ public final class ViewRootImpl implements ViewParent, 
            }



            // Don't lose the mode we last auto-computed.

            if ((attrs.softInputMode & WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST)

            if ((attrs.softInputMode & SOFT_INPUT_MASK_ADJUST)

                    == WindowManager.LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED) {

                mWindowAttributes.softInputMode = (mWindowAttributes.softInputMode

                        & ~WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST)

                        | (oldSoftInputMode & WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST);

                        & ~SOFT_INPUT_MASK_ADJUST) | (oldSoftInputMode & SOFT_INPUT_MASK_ADJUST);

            }



            if ((changes & LayoutParams.SOFT_INPUT_MODE_CHANGED) != 0) {

            if (mWindowAttributes.softInputMode != oldSoftInputMode) {

                requestFitSystemWindows();

            }
@@ -2073,6 +2075,7 @@ public final class ViewRootImpl implements ViewParent, 
        final int sysUiVis = inOutParams.systemUiVisibility | inOutParams.subtreeSystemUiVisibility;

        final int flags = inOutParams.flags;

        final int type = inOutParams.type;

        final int adjust = inOutParams.softInputMode & SOFT_INPUT_MASK_ADJUST;



        if ((inOutParams.privateFlags & PRIVATE_FLAG_APPEARANCE_CONTROLLED) == 0) {

            inOutParams.insetsFlags.appearance = 0;
@@ -2098,12 +2101,13 @@ public final class ViewRootImpl implements ViewParent, 
            }

        }



        inOutParams.privateFlags &= ~PRIVATE_FLAG_INSET_PARENT_FRAME_BY_IME;



        if ((inOutParams.privateFlags & PRIVATE_FLAG_FIT_INSETS_CONTROLLED) != 0) {

            return;

        }



        int types = inOutParams.getFitInsetsTypes();

        int sides = inOutParams.getFitInsetsSides();

        boolean ignoreVis = inOutParams.isFitInsetsIgnoringVisibility();



        if (((sysUiVis & SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) != 0
@@ -2118,10 +2122,13 @@ public final class ViewRootImpl implements ViewParent, 
        if (type == TYPE_TOAST || type == TYPE_SYSTEM_ALERT) {

            ignoreVis = true;

        } else if ((types & Type.systemBars()) == Type.systemBars()) {

            if (adjust == SOFT_INPUT_ADJUST_RESIZE) {

                types |= Type.ime();

            } else {

                inOutParams.privateFlags |= PRIVATE_FLAG_INSET_PARENT_FRAME_BY_IME;

            }

        }

        inOutParams.setFitInsetsTypes(types);

        inOutParams.setFitInsetsSides(sides);

        inOutParams.setFitInsetsIgnoringVisibility(ignoreVis);



        // The fitting of insets are not really controlled by the clients, so we remove the flag.
@@ -2491,8 +2498,7 @@ public final class ViewRootImpl implements ViewParent, 


        if (mFirst || mAttachInfo.mViewVisibilityChanged) {

            mAttachInfo.mViewVisibilityChanged = false;

            int resizeMode = mSoftInputMode &

                    WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST;

            int resizeMode = mSoftInputMode & SOFT_INPUT_MASK_ADJUST;

            // If we are in auto resize mode, then we need to determine

            // what mode to use now.

            if (resizeMode == WindowManager.LayoutParams.SOFT_INPUT_ADJUST_UNSPECIFIED) {
@@ -2505,11 +2511,8 @@ public final class ViewRootImpl implements ViewParent, 
                if (resizeMode == 0) {

                    resizeMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN;

                }

                if ((lp.softInputMode &

                        WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST) != resizeMode) {

                    lp.softInputMode = (lp.softInputMode &

                            ~WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST) |

                            resizeMode;

                if ((lp.softInputMode & SOFT_INPUT_MASK_ADJUST) != resizeMode) {

                    lp.softInputMode = (lp.softInputMode & ~SOFT_INPUT_MASK_ADJUST) | resizeMode;

                    params = lp;

                }

            }

core/java/android/view/WindowManager.java

+6 −0
Original line number Diff line number Diff line
@@ -2032,6 +2032,12 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int PRIVATE_FLAG_FIT_INSETS_CONTROLLED = 0x10000000;



        /**

         * Flag to indicate that the parent frame of a window should be inset by IME.

         * @hide

         */

        public static final int PRIVATE_FLAG_INSET_PARENT_FRAME_BY_IME = 0x40000000;



        /**

         * An internal annotation for flags that can be specified to {@link #softInputMode}.

         *

core/tests/coretests/src/android/view/ViewRootImplTest.java

+10 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; 
import static android.view.View.SYSTEM_UI_FLAG_LOW_PROFILE;

import static android.view.WindowInsetsController.BEHAVIOR_SHOW_BARS_BY_TOUCH;

import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;

import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;

import static android.view.WindowManager.LayoutParams.TYPE_TOAST;
@@ -117,7 +118,15 @@ public class ViewRootImplTest { 
        final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(TYPE_APPLICATION);

        ViewRootImpl.adjustLayoutParamsForCompatibility(attrs);



        // A window which fits system bars must fit IME, unless its type is toast or system alert.

        assertEquals(Type.systemBars(), attrs.getFitInsetsTypes());

    }



    @Test

    public void adjustLayoutParamsForCompatibility_fitSystemBarsAndIme() {

        final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(TYPE_APPLICATION);

        attrs.softInputMode |= SOFT_INPUT_ADJUST_RESIZE;

        ViewRootImpl.adjustLayoutParamsForCompatibility(attrs);



        assertEquals(Type.systemBars() | Type.ime(), attrs.getFitInsetsTypes());

    }

media/java/android/media/ExifInterface.java

+5 −1
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ import java.util.Locale; 
import java.util.Map;

import java.util.Set;

import java.util.TimeZone;

import java.util.UUID;

import java.util.regex.Matcher;

import java.util.regex.Pattern;

import java.util.zip.CRC32;
@@ -2079,7 +2080,10 @@ public class ExifInterface { 
        try {

            // Move the original file to temporary file.

            if (mFilename != null) {

                tempFile = new File(mFilename + ".tmp");

                String parent = originalFile.getParent();

                String name = originalFile.getName();

                String tempPrefix = UUID.randomUUID().toString() + "_";

                tempFile = new File(parent, tempPrefix + name);

                if (!originalFile.renameTo(tempFile)) {

                    throw new IOException("Couldn't rename to " + tempFile.getAbsolutePath());

                }

packages/CarSystemUI/src/com/android/systemui/car/navigationbar/SystemBarConfigs.java

+32 −1
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ import android.view.WindowManager; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.R;

import com.android.systemui.car.notification.BottomNotificationPanelViewMediator;

import com.android.systemui.car.notification.TopNotificationPanelViewMediator;

import com.android.systemui.dagger.qualifiers.Main;



import java.lang.annotation.ElementType;
@@ -95,6 +97,7 @@ public class SystemBarConfigs { 
        populateMaps();

        readConfigs();

        checkEnabledBarsHaveUniqueBarTypes();

        checkSystemBarEnabledForNotificationPanel();

        setInsetPaddingsForOverlappingCorners();

        sortSystemBarSidesByZOrder();

    }
@@ -221,6 +224,34 @@ public class SystemBarConfigs { 
        }

    }



    private void checkSystemBarEnabledForNotificationPanel() throws RuntimeException {



        String notificationPanelMediatorName =

                mResources.getString(R.string.config_notificationPanelViewMediator);

        if (notificationPanelMediatorName == null) {

            return;

        }



        Class<?> notificationPanelMediatorUsed = null;

        try {

            notificationPanelMediatorUsed = Class.forName(notificationPanelMediatorName);

        } catch (ClassNotFoundException e) {

            e.printStackTrace();

        }



        if (!mTopNavBarEnabled && notificationPanelMediatorUsed.isAssignableFrom(

                TopNotificationPanelViewMediator.class)) {

            throw new RuntimeException(

                    "Top System Bar must be enabled to use " + notificationPanelMediatorName);

        }



        if (!mBottomNavBarEnabled && notificationPanelMediatorUsed.isAssignableFrom(

                BottomNotificationPanelViewMediator.class)) {

            throw new RuntimeException("Bottom System Bar must be enabled to use "

                    + notificationPanelMediatorName);

        }

    }



    private void setInsetPaddingsForOverlappingCorners() {

        setInsetPaddingForOverlappingCorner(TOP, LEFT);

        setInsetPaddingForOverlappingCorner(TOP, RIGHT);