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

[DO NOT MERGE] Update onBackPressed() function signature

Browse Source 
A follow-up to ag/20093581 (see b/244635782#comment5).
Due to a refactor, StatusBarKeyguardViewManager::onBackPressed
no longer accepts or returns a boolean.
This parent class (and the child in vendor/google_arc)
are being updated simultaneously.
Note: This is a cherry-pick of ag/20153641 (master -> tm-qpr-dev)

Bug: 244635782
Test: Passed presubmit
Change-Id: Idd16e938162bf50f528efd3934a116f9fde9d60d
This commit is contained in:
Rahul Banerjee
2022-10-10 12:46:51 -07:00
parent 6400326c01
commit aaeebdaff9
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
View File

@@ -3328,7 +3328,7 @@ public class CentralSurfacesImpl extends CoreStartable implements
@Override @Override
public boolean onBackPressed() { public boolean onBackPressed() {
if (mStatusBarKeyguardViewManager.canHandleBackPressed()) { if (mStatusBarKeyguardViewManager.canHandleBackPressed()) {
mStatusBarKeyguardViewManager.onBackPressed(false /* unused */); mStatusBarKeyguardViewManager.onBackPressed();
return true; return true;
} }
if (mNotificationPanelViewController.isQsCustomizing()) { if (mNotificationPanelViewController.isQsCustomizing()) {

15
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -203,7 +203,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "onBackInvokedCallback() called, invoking onBackPressed()"); Log.d(TAG, "onBackInvokedCallback() called, invoking onBackPressed()");
} }
onBackPressed(false /* unused */); onBackPressed();
}; };
private boolean mIsBackCallbackRegistered = false; private boolean mIsBackCallbackRegistered = false;
@@ -1098,16 +1098,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
/** /**
* Notifies this manager that the back button has been pressed. * Notifies this manager that the back button has been pressed.
*/ */
// TODO(b/244635782): This "accept boolean and ignore it, and always return false" was done public void onBackPressed() {
// to make it possible to check this in *and* allow merging to master,
// where ArcStatusBarKeyguardViewManager inherits this class, and its
// build will break if we change this interface.
// So, overall, while this function refactors the behavior of onBackPressed,
// (it now handles the back press, and no longer returns *whether* it did so)
// its interface is not changing right now (but will, in a follow-up CL).
public boolean onBackPressed(boolean ignored) {
if (!canHandleBackPressed()) { if (!canHandleBackPressed()) {
return false; return;
} }
mCentralSurfaces.endAffordanceLaunch(); mCentralSurfaces.endAffordanceLaunch();
@@ -1128,7 +1121,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
mNotificationPanelViewController.expandWithoutQs(); mNotificationPanelViewController.expandWithoutQs();
} }
} }
return false; return;
} }
@Override @Override