Merge "UX polish for quick affordance option border." into tm-qpr-dev am: e6c8d19b8e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/21063809

Change-Id: Ic806924ff7cc4a565a81640bd5c0d81d6d32c988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/drawable/keyguard_quick_affordance_icon_container_background_selected.xml b/res/drawable/keyguard_quick_affordance_icon_container_background_selected.xml
index 93a80eb..6b1ab28 100644
--- a/res/drawable/keyguard_quick_affordance_icon_container_background_selected.xml
+++ b/res/drawable/keyguard_quick_affordance_icon_container_background_selected.xml
@@ -13,22 +13,36 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<shape
+<layer-list
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
+    >
 
-    <stroke
-        android:width="2dp"
-        android:color="@color/text_color_primary" />
+    <item
+        android:left="6dp"
+        android:top="6dp"
+        android:right="6dp"
+        android:bottom="6dp"
+        >
+        <shape
+            android:layout_width="wrap_content"
+            android:shape="rectangle">
 
-    <solid android:color="@color/color_surface_variant" />
+            <solid android:color="@color/color_surface_variant" />
 
-    <corners android:radius="20dp" />
+            <corners android:radius="14dp" />
 
-    <padding
-        android:left="5dp"
-        android:top="5dp"
-        android:right="5dp"
-        android:bottom="5dp" />
+        </shape>
+    </item>
 
-</shape>
+    <item>
+        <shape android:shape="rectangle" >
+
+            <stroke
+                android:width="2dp"
+                android:color="@color/text_color_primary" />
+
+            <corners android:radius="20dp" />
+
+        </shape>
+    </item>
+</layer-list>