Merge "Fix folder order regression (issue 6482634)" into jb-dev
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 61397f7..0e42cdd 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -89,7 +89,7 @@
<string name="folder_hint_text" msgid="8633351560105748141">"이름이 없는 폴더"</string>
<string name="workspace_description_format" msgid="2968608205939373034">"홈 화면 %1$d"</string>
<string name="default_scroll_format" msgid="4057140866420001240">"페이지 %2$d 중 %1$d"</string>
- <string name="workspace_scroll_format" msgid="1704767047951143301">"홈 화면 %2$d 중 %1$d"</string>
+ <string name="workspace_scroll_format" msgid="1704767047951143301">"홈 화면 %1$d/%2$d"</string>
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"앱 페이지 %2$d 중 %1$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"위젯 페이지 %2$d 중 %1$d"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"나만의 홈 화면 만들기"</string>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index efb7753..1ab495f 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -52,7 +52,7 @@
<dimen name="apps_customize_pageLayoutPaddingRight">12dp</dimen>
<dimen name="apps_customize_tab_bar_height">60dp</dimen>
<dimen name="apps_customize_tab_bar_margin_top">8dp</dimen>
- <dimen name="apps_customize_widget_cell_width_gap">0dp</dimen>
+ <dimen name="apps_customize_widget_cell_width_gap">20dp</dimen>
<dimen name="apps_customize_widget_cell_height_gap">24dp</dimen>
<!-- Workspace cell size -->