Use small-screen styles in QS.

Also fixes a bug where not all styles on primary buttons were applied to
secondary buttons, and cleans up some unused stuff.

Test: manual
Bug: 267769257
Change-Id: I974540dd201ce3131644f0826e94689572663d5b

3 files changed, 0 insertions, 33 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterQsFragment.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterQsFragment.java
index 93407b023..f69746e39 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterQsFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterQsFragment.java
@@ -150,7 +150,6 @@ public class SafetyCenterQsFragment extends Fragment {
         ViewGroup root = (ViewGroup) inflater.inflate(R.layout.safety_center_qs, container, false);
         root.setVisibility(View.GONE);
 
-        root.setBackgroundColor(getResources().getColor(R.color.sc_qs_background_color));
         View closeButton = root.findViewById(R.id.close_button);
         closeButton.setOnClickListener((v) -> requireActivity().finish());
         SafetyCenterTouchTarget.configureSize(
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java
index 61b36fc60..0b8706a38 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java
@@ -27,7 +27,6 @@ import android.os.Looper;
 import android.safetycenter.SafetyCenterStatus;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -37,7 +36,6 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.permissioncontroller.R;
-import com.android.permissioncontroller.permission.utils.KotlinUtils;
 import com.android.permissioncontroller.safetycenter.ui.model.SafetyCenterViewModel;
 import com.android.permissioncontroller.safetycenter.ui.model.StatusUiData;
 import com.android.permissioncontroller.safetycenter.ui.view.StatusCardView;
@@ -90,7 +88,6 @@ public class SafetyStatusPreference extends Preference implements ComparablePref
 
         updateStatusText(statusCardView.getTitleView(), statusCardView.getSummaryView());
 
-        configureSafetyProtectionView(statusCardView, context);
         mFirstBind = false;
     }
 
@@ -121,31 +118,6 @@ public class SafetyStatusPreference extends Preference implements ComparablePref
         statusCardView.showButtons(mStatus);
     }
 
-    private void configureSafetyProtectionView(StatusCardView statusCardView, Context context) {
-        View safetyProtectionSectionView =
-                statusCardView.findViewById(R.id.safety_protection_section_view);
-        if (KotlinUtils.INSTANCE.shouldShowSafetyProtectionResources(context)) {
-            // Hide the Safety Protection branding if there are any issue cards
-            safetyProtectionSectionView.setVisibility(
-                    mStatus.hasIssues() ? View.GONE : View.VISIBLE);
-        }
-        if (safetyProtectionSectionView.getVisibility() == View.GONE) {
-            statusCardView.setPaddingRelative(
-                    statusCardView.getPaddingStart(),
-                    statusCardView.getPaddingTop(),
-                    statusCardView.getPaddingEnd(),
-                    /* bottom= */ getContext()
-                            .getResources()
-                            .getDimensionPixelSize(R.dimen.sc_card_margin_bottom));
-        } else {
-            statusCardView.setPaddingRelative(
-                    statusCardView.getPaddingStart(),
-                    statusCardView.getPaddingTop(),
-                    statusCardView.getPaddingEnd(),
-                    /* bottom= */ 0);
-        }
-    }
-
     private void updateStatusText(TextView title, TextView summary) {
         if (mFirstBind) {
             title.setText(mStatus.getTitle());
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/StatusCardView.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/StatusCardView.kt
index 000f773ee..013f32c85 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/StatusCardView.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/StatusCardView.kt
@@ -25,7 +25,6 @@ import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.android.permissioncontroller.R
-import com.android.permissioncontroller.permission.ui.v33.widget.SafetyProtectionSectionView
 import com.android.permissioncontroller.safetycenter.ui.model.StatusUiData
 import com.google.android.material.button.MaterialButton
 
@@ -51,9 +50,6 @@ constructor(
     val summaryView: TextView by lazy { findViewById(R.id.status_summary) }
     val reviewSettingsButton: MaterialButton by lazy { findViewById(R.id.review_settings_button) }
     val rescanButton: MaterialButton by lazy { findViewById(R.id.rescan_button) }
-    val safetyProtectionSectionView: SafetyProtectionSectionView by lazy {
-        findViewById(R.id.safety_protection_section_view)
-    }
 
     fun showButtons(statusUiData: StatusUiData) {
         rescanButton.isEnabled = !statusUiData.isRefreshInProgress