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

Merge changes Ic7751887,I87828825,I223185ac into tm-qpr-dev am: ace9aa40b3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19668417

Change-Id: Iade22e4280c5c8fd54b7f6003da96075c88ec3c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Weir
2022-08-25 22:26:35 +00:00
committed by Automerger Merge Worker
parent b3eb7d75ff ace9aa40b3
commit 833c5816bd
8 changed files with 1394 additions and 1740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt
View File

@@ -33,10 +33,10 @@ import com.android.keyguard.KeyguardUpdateMonitor
import com.android.systemui.ActivityIntentHelper
import com.android.systemui.dagger.qualifiers.Main
import com.android.systemui.plugins.ActivityStarter
import com.android.systemui.shade.NotificationPanelViewController
import com.android.systemui.shared.system.ActivityManagerKt.isInForeground
import com.android.systemui.statusbar.StatusBarState
import com.android.systemui.statusbar.phone.CentralSurfaces
import com.android.systemui.shade.PanelViewController
import com.android.systemui.statusbar.policy.KeyguardStateController
import java.util.concurrent.Executor
import javax.inject.Inject
@@ -117,7 +117,7 @@ class CameraGestureHelper @Inject constructor(
)
} catch (e: RemoteException) {
Log.w(
PanelViewController.TAG,
NotificationPanelViewController.TAG,
"Unable to start camera activity",
e
)

11
packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/BouncerSwipeModule.java
View File

@@ -25,7 +25,7 @@ import com.android.systemui.R;
import com.android.systemui.dagger.qualifiers.Main;
import com.android.systemui.dreams.touch.BouncerSwipeTouchHandler;
import com.android.systemui.dreams.touch.DreamTouchHandler;
import com.android.systemui.shade.PanelViewController;
import com.android.systemui.shade.NotificationPanelViewController;
import com.android.wm.shell.animation.FlingAnimationUtils;
import javax.inject.Named;
@@ -77,8 +77,9 @@ public class BouncerSwipeModule {
Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilderProvider) {
return flingAnimationUtilsBuilderProvider.get()
.reset()
.setMaxLengthSeconds(PanelViewController.FLING_CLOSING_MAX_LENGTH_SECONDS)
.setSpeedUpFactor(PanelViewController.FLING_SPEED_UP_FACTOR)
.setMaxLengthSeconds(
NotificationPanelViewController.FLING_CLOSING_MAX_LENGTH_SECONDS)
.setSpeedUpFactor(NotificationPanelViewController.FLING_SPEED_UP_FACTOR)
.build();
}
@@ -91,8 +92,8 @@ public class BouncerSwipeModule {
Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilderProvider) {
return flingAnimationUtilsBuilderProvider.get()
.reset()
.setMaxLengthSeconds(PanelViewController.FLING_MAX_LENGTH_SECONDS)
.setSpeedUpFactor(PanelViewController.FLING_SPEED_UP_FACTOR)
.setMaxLengthSeconds(NotificationPanelViewController.FLING_MAX_LENGTH_SECONDS)
.setSpeedUpFactor(NotificationPanelViewController.FLING_SPEED_UP_FACTOR)
.build();
}

1600
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

File diff suppressed because it is too large Load Diff

4
packages/SystemUI/src/com/android/systemui/shade/PanelView.java
View File

@@ -29,7 +29,7 @@ import com.android.systemui.statusbar.phone.KeyguardBottomAreaView;
public abstract class PanelView extends FrameLayout {
public static final boolean DEBUG = false;
public static final String TAG = PanelView.class.getSimpleName();
private PanelViewController.TouchHandler mTouchHandler;
private NotificationPanelViewController.TouchHandler mTouchHandler;
protected CentralSurfaces mCentralSurfaces;
protected HeadsUpManagerPhone mHeadsUpManager;
@@ -49,7 +49,7 @@ public abstract class PanelView extends FrameLayout {
super(context, attrs, defStyleAttr);
}
public void setOnTouchListener(PanelViewController.TouchHandler touchHandler) {
public void setOnTouchListener(NotificationPanelViewController.TouchHandler touchHandler) {
super.setOnTouchListener(touchHandler);
mTouchHandler = touchHandler;
}

1489
packages/SystemUI/src/com/android/systemui/shade/PanelViewController.java
View File

File diff suppressed because it is too large Load Diff

8
packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java
View File

@@ -259,7 +259,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
private DisplayMetrics mDisplayMetrics = new DisplayMetrics();
@Mock
private KeyguardClockSwitch mKeyguardClockSwitch;
private PanelViewController.TouchHandler mTouchHandler;
private NotificationPanelViewController.TouchHandler mTouchHandler;
private ConfigurationController mConfigurationController;
@Mock
private MediaHierarchyManager mMediaHiearchyManager;
@@ -454,7 +454,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
doAnswer((Answer<Void>) invocation -> {
mTouchHandler = invocation.getArgument(0);
return null;
}).when(mView).setOnTouchListener(any(PanelViewController.TouchHandler.class));
}).when(mView).setOnTouchListener(any(NotificationPanelViewController.TouchHandler.class));
NotificationWakeUpCoordinator coordinator =
new NotificationWakeUpCoordinator(
@@ -1407,7 +1407,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
when(mQsFrame.getWidth()).thenReturn(1000);
when(mQsHeader.getTop()).thenReturn(0);
when(mQsHeader.getBottom()).thenReturn(1000);
PanelViewController.TouchHandler touchHandler =
NotificationPanelViewController.TouchHandler touchHandler =
mNotificationPanelViewController.createTouchHandler();
mNotificationPanelViewController.setExpandedFraction(1f);
@@ -1427,7 +1427,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
when(mQsFrame.getWidth()).thenReturn(1000);
when(mQsHeader.getTop()).thenReturn(0);
when(mQsHeader.getBottom()).thenReturn(1000);
PanelViewController.TouchHandler touchHandler =
NotificationPanelViewController.TouchHandler touchHandler =
mNotificationPanelViewController.createTouchHandler();
mNotificationPanelViewController.setExpandedFraction(1f);

12
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewControllerTest.kt
View File

@@ -26,22 +26,22 @@ import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
import com.android.systemui.R
import com.android.systemui.SysuiTestCase
import com.android.systemui.shade.PanelViewController
import com.android.systemui.shade.NotificationPanelViewController
import com.android.systemui.statusbar.phone.userswitcher.StatusBarUserSwitcherController
import com.android.systemui.statusbar.policy.ConfigurationController
import com.android.systemui.unfold.SysUIUnfoldComponent
import com.android.systemui.unfold.config.UnfoldTransitionConfig
import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider
import com.android.systemui.util.view.ViewUtil
import com.android.systemui.util.mockito.any
import com.android.systemui.util.view.ViewUtil
import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Test
import org.mockito.ArgumentCaptor
import org.mockito.Mock
import org.mockito.Mockito.spy
import org.mockito.Mockito.mock
import org.mockito.Mockito.`when`
import org.mockito.Mockito.mock
import org.mockito.Mockito.spy
import org.mockito.Mockito.verify
import org.mockito.MockitoAnnotations
import java.util.Optional
@@ -52,7 +52,7 @@ class PhoneStatusBarViewControllerTest : SysuiTestCase() {
private val touchEventHandler = TestTouchEventHandler()
@Mock
private lateinit var panelViewController: PanelViewController
private lateinit var notificationPanelViewController: NotificationPanelViewController
@Mock
private lateinit var panelView: ViewGroup
@Mock
@@ -76,7 +76,7 @@ class PhoneStatusBarViewControllerTest : SysuiTestCase() {
@Before
fun setUp() {
MockitoAnnotations.initMocks(this)
`when`(panelViewController.view).thenReturn(panelView)
`when`(notificationPanelViewController.view).thenReturn(panelView)
`when`(sysuiUnfoldComponent.getStatusBarMoveFromCenterAnimationController())
.thenReturn(moveFromCenterAnimation)
// create the view on main thread as it requires main looper

6
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewTest.kt
View File

@@ -20,7 +20,7 @@ import android.view.MotionEvent
import android.view.ViewGroup
import androidx.test.filters.SmallTest
import com.android.systemui.SysuiTestCase
import com.android.systemui.shade.PanelViewController
import com.android.systemui.shade.NotificationPanelViewController
import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Test
@@ -32,7 +32,7 @@ import org.mockito.MockitoAnnotations
class PhoneStatusBarViewTest : SysuiTestCase() {
@Mock
private lateinit var panelViewController: PanelViewController
private lateinit var notificationPanelViewController: NotificationPanelViewController
@Mock
private lateinit var panelView: ViewGroup
@@ -43,7 +43,7 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
MockitoAnnotations.initMocks(this)
// TODO(b/197137564): Setting up a panel view and its controller feels unnecessary when
// testing just [PhoneStatusBarView].
`when`(panelViewController.view).thenReturn(panelView)
`when`(notificationPanelViewController.view).thenReturn(panelView)
view = PhoneStatusBarView(mContext, null)
}