Merge "Use small-screen behavior for issue cards in QS on large screens." into udc-mainline-prod

1 files changed, 6 insertions, 6 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java
index c56cce0a5..e561bac85 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java
@@ -134,9 +134,7 @@ public class IssueCardPreference extends Preference implements ComparablePrefere
         configureSafetyProtectionView(holder);
         maybeStartResolutionAnimation(holder);
 
-        mSafetyCenterViewModel
-                .getInteractionLogger()
-                .recordIssueViewed(mIssue, mIsDismissed);
+        mSafetyCenterViewModel.getInteractionLogger().recordIssueViewed(mIssue, mIsDismissed);
     }
 
     private void maybeDisplayText(@Nullable CharSequence maybeText, TextView textView) {
@@ -540,9 +538,11 @@ public class IssueCardPreference extends Preference implements ComparablePrefere
                 return;
             }
 
-            int margin =
-                    mContext.getResources()
-                            .getDimensionPixelSize(R.dimen.sc_action_button_list_margin);
+            int marginRes =
+                    mIsLargeScreen
+                            ? R.dimen.sc_action_button_list_margin_large_screen
+                            : R.dimen.sc_action_button_list_margin;
+            int margin = mContext.getResources().getDimensionPixelSize(marginRes);
             Space space = new Space(mContext);
             space.setLayoutParams(new ViewGroup.LayoutParams(margin, margin));
             buttonList.addView(space);