am 637da1b0: am 7bccb42f: Fix 3373059: Crash when drag cancelled in spring-loaded state
* commit '637da1b0c11887bc0dd7d2ddfb44da1400ef2aec':
Fix 3373059: Crash when drag cancelled in spring-loaded state
diff --git a/res/values-es-rUS-xlarge/strings.xml b/res/values-es-rUS-xlarge/strings.xml
index a433f4f..7c8b273 100644
--- a/res/values-es-rUS-xlarge/strings.xml
+++ b/res/values-es-rUS-xlarge/strings.xml
@@ -16,10 +16,14 @@
<!-- XL -->
<string name="wallpapers_temp_tab_text" msgid="1406600851510062325">"Ésta será la pestaña para los fondos de pantalla"</string>
<!-- XL -->
+ <string name="all_apps_tab_apps" msgid="827864997519186499">"Google Apps"</string>
+ <!-- XL -->
<string name="all_apps_no_downloads" msgid="6687010155766000796">"No se encontraron apps."</string>
<!-- XL -->
<string name="group_wallpapers" msgid="5356616257147378618">"Fondos de pantalla"</string>
<!-- XL -->
+ <string name="all_apps_button_label" msgid="825988103463804114">"Google Apps"</string>
+ <!-- XL -->
<string name="all_apps_home_button_label" msgid="4573985169183891042">"Pantalla principal"</string>
<!-- XL -->
<string name="delete_zone_label_workspace" msgid="7170653385628744300">"Eliminar"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index ef4f0bb..d10441b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -64,7 +64,8 @@
<string name="title_select_live_folder" msgid="3753447798805166749">"Избор директоријума"</string>
<string name="all_apps_button_label" msgid="2578400570124163469">"Apps"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Почетна"</string>
- <string name="delete_zone_label_workspace" msgid="7153615831493049150">"Уклони"</string>
+ <!-- no translation found for delete_zone_label_workspace (7153615831493049150) -->
+ <skip />
<!-- no translation found for delete_zone_label_all_apps (6664588234817475108) -->
<skip />
<string name="menu_add" msgid="3065046628354640854">"Додај"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 63b2450..e7f638e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -64,7 +64,8 @@
<string name="title_select_live_folder" msgid="3753447798805166749">"Виберіть папку"</string>
<string name="all_apps_button_label" msgid="2578400570124163469">"Прогр."</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Головна"</string>
- <string name="delete_zone_label_workspace" msgid="7153615831493049150">"Видалити"</string>
+ <!-- no translation found for delete_zone_label_workspace (7153615831493049150) -->
+ <skip />
<!-- no translation found for delete_zone_label_all_apps (6664588234817475108) -->
<skip />
<string name="menu_add" msgid="3065046628354640854">"Додати"</string>
diff --git a/res/values-xlarge/config.xml b/res/values-xlarge/config.xml
index 3e514fb..242e96a 100644
--- a/res/values-xlarge/config.xml
+++ b/res/values-xlarge/config.xml
@@ -66,12 +66,6 @@
<integer name="config_screenOnDropAlphaFadeDelay">350</integer>
<integer name="config_screenOnDropAlphaFadeDuration">50</integer>
- <!-- Workspace screens are cached to bitmaps only when they're smaller than a certain size
- (maxScaleForUsingWorkspaceScreenBitmapCache), since the bitmap cache itself is smaller
- than the view itself (workspaceScreenBitmapCacheScale) -->
- <integer name="config_workspaceScreenBitmapCacheScale">20</integer>
- <integer name="config_maxScaleForUsingWorkspaceScreenBitmapCache">50</integer>
-
<!-- The slope, in percent, of the drag movement needed to drag an item out of the customization
drawer (y / x * 100%) -->
<integer name="config_customizationDrawerDragSlopeThreshold">150</integer>
diff --git a/res/values/config.xml b/res/values/config.xml
index 473ed58..c56a8ce 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -33,6 +33,12 @@
<!-- The distance at which the animation should take the max duration -->
<integer name="config_dropAnimMaxDist">800</integer>
+ <!-- Workspace screens are cached to bitmaps only when they're smaller than a certain size
+ (maxScaleForUsingWorkspaceScreenBitmapCache), since the bitmap cache itself is smaller
+ than the view itself (workspaceScreenBitmapCacheScale) -->
+ <integer name="config_workspaceScreenBitmapCacheScale">20</integer>
+ <integer name="config_maxScaleForUsingWorkspaceScreenBitmapCache">50</integer>
+
<style name="config_orientation">
<item name="@android:screenOrientation">nosensor</item>
</style>