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

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

Merge "Fixing some imports in SysUI tests" into sc-dev

parents bbeeeefc 2838f6e8

packages/SystemUI/res/values/attrs.xml

+10 −6
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ 
    <!-- Size of shadows/elevations on keyguard -->

    <attr name="shadowRadius" format="float" />



    <attr name="handleThickness" format="dimension" />

    <attr name="handleColor" format="color" />

    <attr name="scrimColor" format="color" />



    <!-- Used display CarrierText in Keyguard or QS Footer -->

    <declare-styleable name="CarrierText">

        <attr name="allCaps" format="boolean" />
@@ -173,15 +177,15 @@ 
    </declare-styleable>



    <declare-styleable name="CropView">

        <attr name="handleThickness" format="dimension" />

        <attr name="handleColor" format="color" />

        <attr name="scrimColor" format="color" />

        <attr name="handleThickness" />

        <attr name="handleColor" />

        <attr name="scrimColor" />

    </declare-styleable>



    <declare-styleable name="MagnifierView">

        <attr name="handleThickness" format="dimension" />

        <attr name="handleColor" format="color" />

        <attr name="scrimColor" format="color" />

        <attr name="handleThickness" />

        <attr name="handleColor" />

        <attr name="scrimColor" />

        <attr name="borderThickness" format="dimension" />

        <attr name="borderColor" format="color" />

    </declare-styleable>

packages/SystemUI/tests/src/com/android/systemui/emergency/EmergencyActivityTest.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.systemui.emergency; 
import android.app.Activity;

import android.os.Bundle;



import com.android.systemui.R;

import com.android.systemui.tests.R;



/**

 * Test activity for resolving {@link EmergencyGesture#ACTION_LAUNCH_EMERGENCY} action.

packages/SystemUI/tests/src/com/android/systemui/screenshot/ScrollViewActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public class ScrollViewActivity extends Activity { 
        linearLayout.setOrientation(LinearLayout.VERTICAL);

        TextView text = new TextView(this);

        text.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 40);

        text.setText(com.android.systemui.R.string.test_content);

        text.setText(com.android.systemui.tests.R.string.test_content);

        linearLayout.addView(text);

        scrollView.addView(linearLayout);

        setContentView(scrollView);

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;

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 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;
@@ -61,6 +60,7 @@ import com.android.systemui.statusbar.notification.row.NotificationRowContentBin 
import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.InflationFlag;

import com.android.systemui.statusbar.policy.InflatedSmartReplies;

import com.android.systemui.statusbar.policy.SmartRepliesAndActionsInflater;

import com.android.systemui.tests.R;



import org.junit.Assert;

import org.junit.Before;