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

Merge "Some people refactoring"

Browse Source
This commit is contained in:
Julia Reynolds
2021-01-11 15:41:39 +00:00
committed by Android (Google) Code Review
parent d983829f6b bef9a5f08f
commit 5ff9406350
8 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java
View File

@@ -22,7 +22,6 @@ import static android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID;
import android.app.Activity;
import android.app.INotificationManager;
import android.app.people.IPeopleManager;
import android.app.people.PeopleSpaceTile;
import android.appwidget.AppWidgetManager;
import android.content.ComponentName;
import android.content.Context;

2
core/java/android/app/people/PeopleSpaceTile.java → packages/SystemUI/src/com/android/systemui/people/PeopleSpaceTile.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.app.people;
package com.android.systemui.people;
import android.annotation.NonNull;
import android.app.Person;

1
packages/SystemUI/src/com/android/systemui/people/PeopleSpaceTileView.java
View File

@@ -16,7 +16,6 @@
package com.android.systemui.people;
import android.app.people.PeopleSpaceTile;
import android.content.Context;
import android.content.pm.LauncherApps;
import android.graphics.drawable.Drawable;

2
packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java
View File

@@ -23,7 +23,7 @@ import android.app.Notification;
import android.app.PendingIntent;
import android.app.people.ConversationChannel;
import android.app.people.IPeopleManager;
import android.app.people.PeopleSpaceTile;
import android.appwidget.AppWidgetHost;
import android.appwidget.AppWidgetManager;
import android.content.Context;
import android.content.Intent;

2
packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetRemoteViewsFactory.java
View File

@@ -18,7 +18,7 @@ package com.android.systemui.people.widget;
import android.app.INotificationManager;
import android.app.people.IPeopleManager;
import android.app.people.PeopleSpaceTile;
import com.android.systemui.people.PeopleSpaceTile;
import android.content.Context;
import android.content.Intent;
import android.content.pm.LauncherApps;

11
core/tests/coretests/src/android/app/people/PeopleSpaceTileTest.java → packages/SystemUI/tests/src/com/android/systemui/people/PeopleSpaceTileTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.app.people;
package com.android.systemui.people;
import static com.google.common.truth.Truth.assertThat;
@@ -39,6 +39,9 @@ import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.people.PeopleSpaceTile;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -47,9 +50,8 @@ import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
@SmallTest
public class PeopleSpaceTileTest {
public class PeopleSpaceTileTest extends SysuiTestCase {
private Context mContext;
private final Drawable mDrawable = new ColorDrawable(Color.BLUE);
private final Icon mIcon = PeopleSpaceTile.convertDrawableToIcon(mDrawable);
@@ -58,7 +60,6 @@ public class PeopleSpaceTileTest {
@Before
public void setUp() {
mContext = InstrumentationRegistry.getContext();
MockitoAnnotations.initMocks(this);
when(mLauncherApps.getShortcutIconDrawable(any(), eq(0))).thenReturn(mDrawable);
}
@@ -131,7 +132,7 @@ public class PeopleSpaceTileTest {
PeopleSpaceTile tile = new PeopleSpaceTile.Builder(
new ShortcutInfo.Builder(mContext, "123").build(), mLauncherApps).build();
// Automatically added by creating a ShortcutInfo.
assertThat(tile.getPackageName()).isEqualTo("com.android.frameworks.coretests");
assertThat(tile.getPackageName()).isEqualTo("com.android.systemui.tests");
tile = new PeopleSpaceTile.Builder(
new ShortcutInfo.Builder(mContext, "123").build(), mLauncherApps).setPackageName(

1
packages/SystemUI/tests/src/com/android/systemui/people/PeopleSpaceUtilsTest.java
View File

@@ -32,7 +32,6 @@ import static org.mockito.Mockito.when;
import android.app.Notification;
import android.app.Person;
import android.app.people.PeopleSpaceTile;
import android.appwidget.AppWidgetManager;
import android.content.ContentResolver;
import android.content.Context;

2
packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java
View File

@@ -35,7 +35,6 @@ import android.app.INotificationManager;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.Person;
import android.app.people.PeopleSpaceTile;
import android.appwidget.AppWidgetManager;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -58,6 +57,7 @@ import androidx.test.filters.SmallTest;
import com.android.internal.appwidget.IAppWidgetService;
import com.android.systemui.R;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.people.PeopleSpaceTile;
import com.android.systemui.statusbar.NotificationListener;
import com.android.systemui.statusbar.NotificationListener.NotificationHandler;
import com.android.systemui.statusbar.SbnBuilder;