Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing gradle build for SystemUI"

Browse Source
This commit is contained in:
Sunny Goyal
2020-07-09 00:51:25 +00:00
committed by Android (Google) Code Review
parent d1ec2af44c 41721428bd
commit 0d45ff9de7
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/Utils/AndroidManifest.xml
View File

@@ -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" />

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

@@ -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 {

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

@@ -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;

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

@@ -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

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

@@ -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;

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationContentInflaterTest.java
View File

@@ -50,6 +50,7 @@ import android.widget.TextView;
import androidx.test.filters.SmallTest;
import androidx.test.filters.Suppress;
import com.android.systemui.R;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.media.MediaFeatureFlag;
import com.android.systemui.statusbar.NotificationRemoteInputManager;
@@ -60,7 +61,6 @@ import com.android.systemui.statusbar.notification.row.NotificationRowContentBin
import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationCallback;
import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;
import com.android.systemui.statusbar.policy.SmartReplyConstants;
import com.android.systemui.tests.R;
import org.junit.Assert;
import org.junit.Before;

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java
View File

@@ -43,6 +43,7 @@ import android.text.TextUtils;
import android.view.LayoutInflater;
import android.widget.RemoteViews;
import com.android.systemui.R;
import com.android.systemui.TestableDependency;
import com.android.systemui.bubbles.BubbleController;
import com.android.systemui.bubbles.BubblesTestActivity;
@@ -69,7 +70,6 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController;
import com.android.systemui.statusbar.phone.NotificationGroupManager;
import com.android.systemui.statusbar.phone.NotificationShadeWindowController;
import com.android.systemui.statusbar.policy.SmartReplyConstants;
import com.android.systemui.tests.R;
import org.mockito.ArgumentCaptor;

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationCustomViewWrapperTest.java
View File

@@ -24,10 +24,10 @@ import android.widget.RemoteViews;
import androidx.test.filters.SmallTest;
import com.android.systemui.R;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;
import com.android.systemui.statusbar.notification.row.NotificationTestHelper;
import com.android.systemui.tests.R;
import org.junit.Assert;
import org.junit.Before;