From fdd73ffb0279501bbd38fa7605949cc57b13217c Mon Sep 17 00:00:00 2001
From: Jay Aliomer <aaliomer@google.com>
Date: Tue, 5 May 2020 23:14:08 -0400
Subject: [PATCH] Fixing stroked qs tile

Bug: 145530620
Test: manual
Change-Id: I612e4bc4639f4551c5dda6dd4509fb3a96464689
---
 core/res/res/values/dimens.xml                                | 4 ++++
 core/res/res/values/symbols.xml                               | 2 ++
 .../src/com/android/systemui/qs/tileimpl/QSTileBaseView.java  | 4 ++--
 .../IconShapeTaperedRectOverlay/res/values/config.xml         | 3 +--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 80db9eacacc0d..ea4055ba72266 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -559,6 +559,10 @@
 
     <dimen name="resolver_max_width">480dp</dimen>
 
+    <!-- Tile Stroke width -->
+    <dimen name="config_qsTileStrokeWidthActive">-1dp</dimen>
+    <dimen name="config_qsTileStrokeWidthInactive">-1dp</dimen>
+
     <!-- Amount to reduce the size of the circular mask by (to compensate for
          aliasing effects). This is only used on circular displays. -->
     <dimen name="circular_display_mask_thickness">1px</dimen>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index bbce34c71cc89..43933deaf306d 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -361,6 +361,8 @@
   <java-symbol type="bool" name="config_disableUsbPermissionDialogs"/>
   <java-symbol type="dimen" name="config_highResTaskSnapshotScale" />
   <java-symbol type="dimen" name="config_lowResTaskSnapshotScale" />
+  <java-symbol type="dimen" name="config_qsTileStrokeWidthInactive" />
+  <java-symbol type="dimen" name="config_qsTileStrokeWidthActive" />
   <java-symbol type="bool" name="config_use16BitTaskSnapshotPixelFormat" />
   <java-symbol type="bool" name="config_hasRecents" />
   <java-symbol type="string" name="config_recentsComponentName" />
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java
index adacda3244a0e..f821b19146587 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileBaseView.java
@@ -88,9 +88,9 @@ public class QSTileBaseView extends com.android.systemui.plugins.qs.QSTileView {
         int padding = context.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_padding);
         mIconFrame = new FrameLayout(context);
         mStrokeWidthActive = context.getResources()
-                .getDimension(R.dimen.config_qsTileStrokeWidthActive);
+                .getDimension(com.android.internal.R.dimen.config_qsTileStrokeWidthActive);
         mStrokeWidthInactive = context.getResources()
-                .getDimension(R.dimen.config_qsTileStrokeWidthInactive);
+                .getDimension(com.android.internal.R.dimen.config_qsTileStrokeWidthInactive);
         int size = context.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_size);
         addView(mIconFrame, new LayoutParams(size, size));
         mBg = new ImageView(getContext());
diff --git a/packages/overlays/IconShapeTaperedRectOverlay/res/values/config.xml b/packages/overlays/IconShapeTaperedRectOverlay/res/values/config.xml
index 8e80c9df1da34..63ba20e779c3a 100644
--- a/packages/overlays/IconShapeTaperedRectOverlay/res/values/config.xml
+++ b/packages/overlays/IconShapeTaperedRectOverlay/res/values/config.xml
@@ -24,6 +24,5 @@
     <!-- Corner radius for bottom sheet system dialogs -->
     <dimen name="config_bottomDialogCornerRadius">0dp</dimen>
     <!-- Tile stroke width -->
-    <dimen name="config_qsTileStrokeWidthInactive">10dp</dimen>
-
+    <dimen name="config_qsTileStrokeWidthInactive">1dp</dimen>
 </resources>