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

Commit 126463d8 authored by Jeff Gaston's avatar Jeff Gaston Committed by android-build-merger
Browse files

Merge "Update for sdk drop" into pi-dev am: 71436c63 

am: d52a9561

Change-Id: Icd9779b5d6d507be136a12f15f08ca8fa584f51a
parents 31492bd5 d52a9561

packages/SystemUI/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -220,7 +220,8 @@ 
        android:supportsRtl="true"

        android:theme="@style/Theme.SystemUI"

        android:defaultToDeviceProtectedStorage="true"

        android:directBootAware="true">

        android:directBootAware="true"

        android:appComponentFactory="android.support.v4.app.CoreComponentFactory">

        <!-- Keep theme in sync with SystemUIApplication.onCreate().

             Setting the theme on the application does not affect views inflated by services.

             The application theme is set again from onCreate to take effect for those views. -->

packages/SystemUI/proguard.flags

+1 −0
Original line number Diff line number Diff line
@@ -41,3 +41,4 @@ 
-keep class com.android.systemui.plugins.** {

    public protected *;

}

-keep class android.support.v4.app.CoreComponentFactory

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardSliceProviderTest.java

+2 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import org.mockito.MockitoAnnotations; 


import java.util.Arrays;

import java.util.concurrent.TimeUnit;

import java.util.HashSet;



import androidx.slice.SliceItem;

import androidx.slice.SliceProvider;
@@ -66,7 +67,7 @@ public class KeyguardSliceProviderTest extends SysuiTestCase { 
        MockitoAnnotations.initMocks(this);

        mProvider = new TestableKeyguardSliceProvider();

        mProvider.attachInfo(getContext(), null);

        SliceProvider.setSpecs(Arrays.asList(SliceSpecs.LIST));

        SliceProvider.setSpecs(new HashSet<>(Arrays.asList(SliceSpecs.LIST)));

    }



    @Test