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

Commit 050c7a67 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10342804 from 7bc94f50 to udc-release 

Change-Id: Ibca72f777e0e939cbe5ca961eb0ea148aac9dffc
parents f054f0dd 7bc94f50

core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java

+0 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static com.google.common.truth.Truth.assertThat; 
import android.app.Activity;

import android.compat.testing.PlatformCompatChangeRule;

import android.os.Bundle;

import android.platform.test.annotations.IwTest;

import android.platform.test.annotations.PlatinumTest;

import android.platform.test.annotations.Presubmit;

import android.provider.Settings;
@@ -74,7 +73,6 @@ public class FontScaleConverterActivityTest { 
    }



    @PlatinumTest(focusArea = "accessibility")

    @IwTest(focusArea = "accessibility")

    @Test

    public void testFontsScaleNonLinearly() {

        final ActivityScenario<TestActivity> scenario = rule.getScenario();
@@ -106,7 +104,6 @@ public class FontScaleConverterActivityTest { 
    }



    @PlatinumTest(focusArea = "accessibility")

    @IwTest(focusArea = "accessibility")

    @Test

    public void testOnConfigurationChanged_doesNotCrash() {

        final ActivityScenario<TestActivity> scenario = rule.getScenario();
@@ -121,7 +118,6 @@ public class FontScaleConverterActivityTest { 
    }



    @PlatinumTest(focusArea = "accessibility")

    @IwTest(focusArea = "accessibility")

    @Test

    public void testUpdateConfiguration_doesNotCrash() {

        final ActivityScenario<TestActivity> scenario = rule.getScenario();

libs/WindowManager/Shell/res/color/taskbar_background_dark.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 
  -->

<!-- Should be the same as in packages/apps/Launcher3/res/color-night-v31/taskbar_background.xml -->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="@android:color/system_neutral1_500" android:lStar="20" />

    <item android:color="@android:color/system_neutral1_500" android:lStar="6" />

</selector>
 
 No newline at end of file

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/PhysicsAnimationLayout.java

+3 −0
Original line number Diff line number Diff line
@@ -523,6 +523,7 @@ public class PhysicsAnimationLayout extends FrameLayout { 
     */

    @Nullable private SpringAnimation getSpringAnimationFromView(

            DynamicAnimation.ViewProperty property, View view) {

        if (view == null) return null;

        return (SpringAnimation) view.getTag(getTagIdForProperty(property));

    }
@@ -531,11 +532,13 @@ public class PhysicsAnimationLayout extends FrameLayout { 
     * system.

     */

    @Nullable private ViewPropertyAnimator getViewPropertyAnimatorFromView(View view) {

        if (view == null) return null;

        return (ViewPropertyAnimator) view.getTag(R.id.reorder_animator_tag);

    }



    /** Retrieves the target animator from the view via the view tag system. */

    @Nullable private ObjectAnimator getTargetAnimatorFromView(View view) {

        if (view == null) return null;

        return (ObjectAnimator) view.getTag(R.id.target_animator_tag);

    }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/CopyContentInSplit.kt

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.IwTest

import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.traces.component.ComponentNameMatcher
@@ -62,7 +61,6 @@ class CopyContentInSplit(override val flicker: FlickerTest) : 
        }



    @PlatinumTest(focusArea = "sysui")

    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun cujCompleted() {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DragDividerToResize.kt

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.IwTest

import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
@@ -60,7 +59,6 @@ class DragDividerToResize(override val flicker: FlickerTest) : 
        }



    @PlatinumTest(focusArea = "sysui")

    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun cujCompleted() {