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

Commit 0d45ff9d authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Fixing gradle build for SystemUI"

parents d1ec2af4 41721428

packages/SettingsLib/Utils/AndroidManifest.xml

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



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

          package="com.android.settingslib.utils">

          package="com.android.settingslib.widget">



    <uses-sdk android:minSdkVersion="21" />

packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.content.pm.PackageManager; 
import android.os.UserManager;

import android.util.Log;



import com.android.settingslib.utils.R;

import com.android.settingslib.widget.R;



public class AppUtils {

packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleTest.java

+1 −1
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ import android.testing.TestableLooper; 


import androidx.test.filters.SmallTest;



import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder;

import com.android.systemui.tests.R;



import org.junit.Before;

import org.junit.Test;

packages/SystemUI/tests/src/com/android/systemui/bubbles/BubblesTestActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.app.Activity; 
import android.content.Intent;

import android.os.Bundle;



import com.android.systemui.tests.R;

import com.android.systemui.R;



/**

 * Referenced by NotificationTestHelper#makeBubbleMetadata

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/MediaNotificationProcessorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ import android.widget.RemoteViews; 
import androidx.palette.graphics.Palette;

import androidx.test.runner.AndroidJUnit4;



import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.tests.R;



import org.junit.After;

import org.junit.Before;