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

Bug fix for wallet screen and lockscreen icon.

Browse Source 
1. Make the header icon imageview a fixed size.
2. Fix an NPE for when the card doesn't have a label text.
3. The lockscreen should request 1 maxCards instead of 2 (align with the Wallet Tile)

Test: manual
Bug: 187860480
Change-Id: Ic9b015c40260a44382a97ae02aa30cb0ee15a29d
This commit is contained in:
Silin Huang
2021-05-12 00:39:47 -07:00
parent 0a35d1d6b4
commit e8ed11ddea
5 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/wallet_fullscreen.xml
View File

@@ -36,8 +36,8 @@
android:orientation="vertical">
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/wallet_screen_header_view_size"
android:layout_height="@dimen/wallet_screen_header_view_size"
android:layout_gravity="center_horizontal"
android:layout_marginVertical="10dp"
android:scaleType="center"

3
packages/SystemUI/res/values/dimens.xml
View File

@@ -1492,7 +1492,8 @@
<!-- Wallet activity screen specs -->
<dimen name="wallet_icon_size">36sp</dimen>
<dimen name="wallet_view_header_icon_size">56dp</dimen>
<dimen name="wallet_screen_header_icon_size">56dp</dimen>
<dimen name="wallet_screen_header_view_size">80dp</dimen>
<dimen name="card_margin">16dp</dimen>
<dimen name="card_carousel_dot_offset">24dp</dimen>
<dimen name="card_carousel_dot_unselected_radius">2dp</dimen>

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

@@ -929,7 +929,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
}
GetWalletCardsRequest request =
new GetWalletCardsRequest(1 /* cardWidth */, 1 /* cardHeight */,
1 /* iconSizePx */, 2 /* maxCards */);
1 /* iconSizePx */, 1 /* maxCards */);
mQuickAccessWalletClient.getWalletCards(mUiExecutor, request, mCardRetriever);
}

10
packages/SystemUI/src/com/android/systemui/wallet/ui/WalletScreenController.java
View File

@@ -234,7 +234,9 @@ public class WalletScreenController implements
mWalletView.show();
mWalletView.hideErrorMessage();
int iconSizePx =
mContext.getResources().getDimensionPixelSize(R.dimen.wallet_view_header_icon_size);
mContext
.getResources()
.getDimensionPixelSize(R.dimen.wallet_screen_header_icon_size);
GetWalletCardsRequest request =
new GetWalletCardsRequest(cardWidthPx, cardHeightPx, iconSizePx, MAX_CARDS);
mWalletClient.getWalletCards(mExecutor, request, this);
@@ -340,7 +342,11 @@ public class WalletScreenController implements
@Override
public CharSequence getLabel() {
return mWalletCard.getCardLabel();
CharSequence label = mWalletCard.getCardLabel();
if (label == null) {
return "";
}
return label;
}
@Override

14
packages/SystemUI/src/com/android/systemui/wallet/ui/WalletView.java
View File

@@ -134,7 +134,8 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard
mCardCarouselContainer.setVisibility(VISIBLE);
mErrorView.setVisibility(GONE);
mEmptyStateView.setVisibility(GONE);
renderHeaderIconAndActionButton(data.get(selectedIndex), isDeviceLocked);
mIcon.setImageDrawable(getHeaderIcon(mContext, data.get(selectedIndex)));
renderActionButton(data.get(selectedIndex), isDeviceLocked);
if (shouldAnimate) {
animateViewsShown(mIcon, mCardLabel, mActionButton);
}
@@ -221,17 +222,6 @@ public class WalletView extends FrameLayout implements WalletCardCarousel.OnCard
return mCardLabel;
}
private void renderHeaderIconAndActionButton(WalletCardViewInfo walletCard, boolean isLocked) {
Drawable icon = getHeaderIcon(mContext, walletCard);
if (icon != null) {
mIcon.setImageDrawable(walletCard.getIcon());
mIcon.setVisibility(VISIBLE);
} else {
mIcon.setVisibility(INVISIBLE);
}
renderActionButton(walletCard, isLocked);
}
@Nullable
private static Drawable getHeaderIcon(Context context, WalletCardViewInfo walletCard) {
Drawable icon = walletCard.getIcon();