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

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

Merge cherrypicks of [4073730, 4073603, 4073604, 4071680, 4071681] into pi-release 

Change-Id: Ie68b781aadd050d9b4532308e5c5c0d3f24daddf
parents 05fd3cae 96836814

core/java/android/provider/SettingsValidators.java

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public class SettingsValidators { 
    public static final Validator COMPONENT_NAME_VALIDATOR = new Validator() {

        @Override

        public boolean validate(String value) {

            return ComponentName.unflattenFromString(value) != null;

            return value != null && ComponentName.unflattenFromString(value) != null;

        }

    };

core/tests/coretests/src/android/provider/SettingsValidatorsTest.java

+6 −1
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package android.provider;



import static org.junit.Assert.fail;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;



import android.platform.test.annotations.Presubmit;

import android.provider.SettingsValidators.Validator;
@@ -62,6 +62,11 @@ public class SettingsValidatorsTest { 
        assertFalse(SettingsValidators.COMPONENT_NAME_VALIDATOR.validate("rectangle"));

    }



    @Test

    public void testComponentNameValidator_onNullValue_doesNotThrow() {

        assertFalse(SettingsValidators.COMPONENT_NAME_VALIDATOR.validate(null));

    }



    @Test

    public void testLocaleValidator() {

        assertTrue(SettingsValidators.LOCALE_VALIDATOR.validate("en_US"));

packages/SystemUI/res/layout/status_bar_notification_footer.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        android:paddingStart="4dp"

        android:paddingEnd="4dp"

        android:visibility="gone">

    <FrameLayout

    <com.android.systemui.statusbar.AlphaOptimizedFrameLayout

        android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content" >
@@ -46,5 +46,5 @@ 
            android:contentDescription="@string/accessibility_clear_all"

            android:text="@string/clear_all_notifications_text"

            android:textColor="?attr/wallpaperTextColor"/>

    </FrameLayout>

    </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>

</com.android.systemui.statusbar.FooterView>

packages/SystemUI/src/com/android/systemui/statusbar/EmptyShadeView.java

+1 −2
Original line number Diff line number Diff line
@@ -84,8 +84,7 @@ public class EmptyShadeView extends StackScrollerDecorView { 
            if (view instanceof EmptyShadeView) {

                EmptyShadeView emptyShadeView = (EmptyShadeView) view;

                boolean visible = this.clipTopAmount <= mEmptyText.getPaddingTop() * 0.6f;

                emptyShadeView.performVisibilityAnimation(

                        visible && !emptyShadeView.willBeGone());

                emptyShadeView.setContentVisible(visible && emptyShadeView.isVisible());

            }

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/FooterView.java

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class FooterView extends StackScrollerDecorView { 
            if (view instanceof FooterView) {

                FooterView footerView = (FooterView) view;

                boolean visible = this.clipTopAmount < mClearAllTopPadding;

                footerView.performVisibilityAnimation(visible && !footerView.willBeGone());

                footerView.setContentVisible(visible && footerView.isVisible());

            }

        }

    }