Merge "Setting/getting per-screen wallpaper (2/3)." into tm-qpr-dev
diff --git a/res/layout/fragment_lock_screen_quick_affordances.xml b/res/layout/fragment_lock_screen_quick_affordances.xml
index 3fc7275..714d4fa 100644
--- a/res/layout/fragment_lock_screen_quick_affordances.xml
+++ b/res/layout/fragment_lock_screen_quick_affordances.xml
@@ -62,8 +62,9 @@
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@id/slot_tabs"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
                 android:clipToPadding="false"
                 android:paddingHorizontal="16dp" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 125bda1..72a013a 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -276,14 +276,14 @@
     buttons can be added to the lock screen. In left-to-right languages, this is the left-hand side
     button. In right-to-left languages, this is the right-hand side button. [CHAR LIMIT=16].
     -->
-    <string name="keyguard_slot_name_bottom_start">Left button</string>
+    <string name="keyguard_slot_name_bottom_start">Left</string>
 
     <!--
     Name of the slot on the "end" side of the bottom of the lock screen, where quick affordance
     buttons can be added to the lock screen. In left-to-right languages, this is the right-hand side
     button. In right-to-left languages, this is the left-hand side button. [CHAR LIMIT=16].
     -->
-    <string name="keyguard_slot_name_bottom_end">Right button</string>
+    <string name="keyguard_slot_name_bottom_end">Right</string>
 
     <!--
     Name for an option to have no quick affordance selected for one of the sides of the lock