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

Merge "Update gpay icon on keyguard visibility" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-15 22:48:17 +00:00
committed by Android (Google) Code Review
parent e438034aee b28ccdd2b4
commit 8d4b0ccbd8
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
View File

@@ -68,6 +68,7 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
@@ -154,6 +155,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
private StatusBar mStatusBar; private StatusBar mStatusBar;
private KeyguardAffordanceHelper mAffordanceHelper; private KeyguardAffordanceHelper mAffordanceHelper;
private FalsingManager mFalsingManager; private FalsingManager mFalsingManager;
@Nullable private Executor mUiExecutor;
private boolean mUserSetupComplete; private boolean mUserSetupComplete;
private boolean mPrewarmBound; private boolean mPrewarmBound;
private Messenger mPrewarmMessenger; private Messenger mPrewarmMessenger;
@@ -429,7 +431,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
} }
private void updateWalletVisibility() { private void updateWalletVisibility() {
if (mDozing || !mWalletEnabled) { if (mDozing || !mWalletEnabled || !mHasCard) {
mWalletButton.setVisibility(GONE); mWalletButton.setVisibility(GONE);
} else { } else {
mWalletButton.setVisibility(VISIBLE); mWalletButton.setVisibility(VISIBLE);
@@ -659,6 +661,13 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
updateCameraVisibility(); updateCameraVisibility();
} }
@Override
public void onKeyguardShowingChanged() {
if (mKeyguardStateController.isShowing()) {
queryWalletCards();
}
}
private void inflateCameraPreview() { private void inflateCameraPreview() {
View previewBefore = mCameraPreview; View previewBefore = mCameraPreview;
boolean visibleBefore = false; boolean visibleBefore = false;
@@ -897,18 +906,20 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
public void initWallet(QuickAccessWalletClient client, Executor uiExecutor, boolean enabled) { public void initWallet(QuickAccessWalletClient client, Executor uiExecutor, boolean enabled) {
mQuickAccessWalletClient = client; mQuickAccessWalletClient = client;
mWalletEnabled = enabled && client.isWalletFeatureAvailable(); mWalletEnabled = enabled && client.isWalletFeatureAvailable();
mUiExecutor = uiExecutor;
queryWalletCards();
if (mWalletEnabled) {
queryWalletCards(uiExecutor);
}
updateWalletVisibility(); updateWalletVisibility();
} }
private void queryWalletCards(Executor uiExecutor) { private void queryWalletCards() {
if (!mWalletEnabled || mUiExecutor == null) {
return;
}
GetWalletCardsRequest request = GetWalletCardsRequest request =
new GetWalletCardsRequest(1 /* cardWidth */, 1 /* cardHeight */, new GetWalletCardsRequest(1 /* cardWidth */, 1 /* cardHeight */,
1 /* iconSizePx */, 2 /* maxCards */); 1 /* iconSizePx */, 2 /* maxCards */);
mQuickAccessWalletClient.getWalletCards(uiExecutor, request, mCardRetriever); mQuickAccessWalletClient.getWalletCards(mUiExecutor, request, mCardRetriever);
} }
private void onWalletClick(View v) { private void onWalletClick(View v) {