diff options
Diffstat (limited to 'res')
27 files changed, 17 insertions, 10 deletions
diff --git a/res/drawable-hdpi/all_apps_bg_gradient.png b/res/drawable-hdpi/all_apps_bg_gradient.png Binary files differnew file mode 100644 index 000000000..c420ca567 --- /dev/null +++ b/res/drawable-hdpi/all_apps_bg_gradient.png diff --git a/res/drawable-hdpi/homescreen_large_blue.9.png b/res/drawable-hdpi/homescreen_large_blue.9.png Binary files differnew file mode 100644 index 000000000..416514dbe --- /dev/null +++ b/res/drawable-hdpi/homescreen_large_blue.9.png diff --git a/res/drawable-hdpi/homescreen_large_blue_strong.9.png b/res/drawable-hdpi/homescreen_large_blue_strong.9.png Binary files differnew file mode 100644 index 000000000..d7e32e796 --- /dev/null +++ b/res/drawable-hdpi/homescreen_large_blue_strong.9.png diff --git a/res/drawable-hdpi/homescreen_large_green.9.png b/res/drawable-hdpi/homescreen_large_green.9.png Binary files differnew file mode 100644 index 000000000..60042c2dd --- /dev/null +++ b/res/drawable-hdpi/homescreen_large_green.9.png diff --git a/res/drawable-hdpi/homescreen_large_green_strong.9.png b/res/drawable-hdpi/homescreen_large_green_strong.9.png Binary files differnew file mode 100644 index 000000000..c40b98ee2 --- /dev/null +++ b/res/drawable-hdpi/homescreen_large_green_strong.9.png diff --git a/res/drawable-hdpi/homescreen_small_blue.9.png b/res/drawable-hdpi/homescreen_small_blue.9.png Binary files differnew file mode 100644 index 000000000..ddc458ba2 --- /dev/null +++ b/res/drawable-hdpi/homescreen_small_blue.9.png diff --git a/res/drawable-hdpi/homescreen_small_blue_strong.9.png b/res/drawable-hdpi/homescreen_small_blue_strong.9.png Binary files differnew file mode 100644 index 000000000..8f5a74efc --- /dev/null +++ b/res/drawable-hdpi/homescreen_small_blue_strong.9.png diff --git a/res/drawable-hdpi/homescreen_small_green_strong.9.png b/res/drawable-hdpi/homescreen_small_green_strong.9.png Binary files differnew file mode 100644 index 000000000..77baa5296 --- /dev/null +++ b/res/drawable-hdpi/homescreen_small_green_strong.9.png diff --git a/res/drawable-large-hdpi/homescreen_large_blue.9.png b/res/drawable-large-hdpi/homescreen_large_blue.9.png Binary files differdeleted file mode 100644 index 6ce3d29fb..000000000 --- a/res/drawable-large-hdpi/homescreen_large_blue.9.png +++ /dev/null diff --git a/res/drawable-large-hdpi/homescreen_large_blue_strong.9.png b/res/drawable-large-hdpi/homescreen_large_blue_strong.9.png Binary files differdeleted file mode 100644 index 811014826..000000000 --- a/res/drawable-large-hdpi/homescreen_large_blue_strong.9.png +++ /dev/null diff --git a/res/drawable-large-hdpi/homescreen_large_green.9.png b/res/drawable-large-hdpi/homescreen_large_green.9.png Binary files differdeleted file mode 100644 index 4a6546ee4..000000000 --- a/res/drawable-large-hdpi/homescreen_large_green.9.png +++ /dev/null diff --git a/res/drawable-large-hdpi/homescreen_large_green_strong.9.png b/res/drawable-large-hdpi/homescreen_large_green_strong.9.png Binary files differdeleted file mode 100644 index 5ba9ebe79..000000000 --- a/res/drawable-large-hdpi/homescreen_large_green_strong.9.png +++ /dev/null diff --git a/res/drawable-large-hdpi/homescreen_small_blue.9.png b/res/drawable-large-hdpi/homescreen_small_blue.9.png Binary files differdeleted file mode 100644 index db93b3ccd..000000000 --- a/res/drawable-large-hdpi/homescreen_small_blue.9.png +++ /dev/null diff --git a/res/drawable-large-hdpi/homescreen_small_blue_strong.9.png b/res/drawable-large-hdpi/homescreen_small_blue_strong.9.png Binary files differdeleted file mode 100644 index 32bd857d3..000000000 --- a/res/drawable-large-hdpi/homescreen_small_blue_strong.9.png +++ /dev/null diff --git a/res/drawable-large-hdpi/homescreen_small_green.9.png b/res/drawable-large-hdpi/homescreen_small_green.9.png Binary files differdeleted file mode 100644 index 00baae948..000000000 --- a/res/drawable-large-hdpi/homescreen_small_green.9.png +++ /dev/null diff --git a/res/drawable-large-hdpi/homescreen_small_green_strong.9.png b/res/drawable-large-hdpi/homescreen_small_green_strong.9.png Binary files differdeleted file mode 100644 index e1e64c57a..000000000 --- a/res/drawable-large-hdpi/homescreen_small_green_strong.9.png +++ /dev/null diff --git a/res/drawable-large-mdpi/homescreen_small_green.9.png b/res/drawable-large-mdpi/homescreen_small_green.9.png Binary files differdeleted file mode 100644 index 58698ea8d..000000000 --- a/res/drawable-large-mdpi/homescreen_small_green.9.png +++ /dev/null diff --git a/res/drawable-mdpi/all_apps_bg_gradient.png b/res/drawable-mdpi/all_apps_bg_gradient.png Binary files differnew file mode 100644 index 000000000..c420ca567 --- /dev/null +++ b/res/drawable-mdpi/all_apps_bg_gradient.png diff --git a/res/drawable-large-mdpi/homescreen_large_blue.9.png b/res/drawable-mdpi/homescreen_large_blue.9.png Binary files differindex 5e7e61f27..5e7e61f27 100644 --- a/res/drawable-large-mdpi/homescreen_large_blue.9.png +++ b/res/drawable-mdpi/homescreen_large_blue.9.png diff --git a/res/drawable-large-mdpi/homescreen_large_green.9.png b/res/drawable-mdpi/homescreen_large_green.9.png Binary files differindex 2f83bac7d..2f83bac7d 100644 --- a/res/drawable-large-mdpi/homescreen_large_green.9.png +++ b/res/drawable-mdpi/homescreen_large_green.9.png diff --git a/res/drawable-large-mdpi/homescreen_large_green_strong.9.png b/res/drawable-mdpi/homescreen_large_green_strong.9.png Binary files differindex 1e145029b..1e145029b 100644 --- a/res/drawable-large-mdpi/homescreen_large_green_strong.9.png +++ b/res/drawable-mdpi/homescreen_large_green_strong.9.png diff --git a/res/drawable-large-mdpi/homescreen_small_blue.9.png b/res/drawable-mdpi/homescreen_small_blue.9.png Binary files differindex 28bc33b18..28bc33b18 100644 --- a/res/drawable-large-mdpi/homescreen_small_blue.9.png +++ b/res/drawable-mdpi/homescreen_small_blue.9.png diff --git a/res/drawable-large-mdpi/homescreen_small_blue_strong.9.png b/res/drawable-mdpi/homescreen_small_blue_strong.9.png Binary files differindex f286de9fe..f286de9fe 100644 --- a/res/drawable-large-mdpi/homescreen_small_blue_strong.9.png +++ b/res/drawable-mdpi/homescreen_small_blue_strong.9.png diff --git a/res/drawable-large-mdpi/homescreen_small_green_strong.9.png b/res/drawable-mdpi/homescreen_small_green_strong.9.png Binary files differindex 977308579..977308579 100644 --- a/res/drawable-large-mdpi/homescreen_small_green_strong.9.png +++ b/res/drawable-mdpi/homescreen_small_green_strong.9.png diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index 604dff4f8..f3ecb4824 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -16,11 +16,14 @@ <com.android.launcher2.AppsCustomizeTabHost xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"> + <com.android.launcher2.AllAppsBackground + android:id="@+id/all_apps_background" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <LinearLayout android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="#FF000000"> + android:layout_height="match_parent"> <!-- The layout_width of the tab bar gets overriden to align the content with the text in the tabs in AppsCustomizeTabHost. --> <FrameLayout diff --git a/res/values-large/config.xml b/res/values-large/config.xml index 8b7769659..dca8282ab 100644 --- a/res/values-large/config.xml +++ b/res/values-large/config.xml @@ -6,6 +6,8 @@ <integer name="config_customizeZoomOutTime">600</integer> <integer name="config_customizeZoomScaleFactor">7</integer> <integer name="config_customizeFadeInTime">800</integer> + <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. --> + <integer name="config_workspaceSpringLoadShrinkPercentage">70</integer> <!-- The slope, in percent, of the drag movement needed to drag an item out of Customize (y / x * 100%) --> @@ -24,12 +26,4 @@ <!-- When shrinking the workspace, this is the percentage of its original size. --> <integer name="config_workspaceShrinkPercent">17</integer> - <!-- When items are dropped on the mini screens in customize mode, we have a bounce animation - of the bright green hover outline, and then fade out the outline at the end. These are - the values used in that animation --> - <integer name="config_screenOnDropScalePercent">120</integer> - <integer name="config_screenOnDropScaleUpDuration">200</integer> - <integer name="config_screenOnDropScaleDownDuration">200</integer> - <integer name="config_screenOnDropAlphaFadeDelay">350</integer> - <integer name="config_screenOnDropAlphaFadeDuration">50</integer> </resources> diff --git a/res/values/config.xml b/res/values/config.xml index 44ba589c8..394ff8afa 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -5,6 +5,16 @@ <integer name="config_dragAppsCustomizeIconFadeOutDuration">200</integer> <integer name="config_dragAppsCustomizeIconFadeAlpha">100</integer> <integer name="config_workspaceUnshrinkTime">650</integer> + <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. --> + <integer name="config_workspaceSpringLoadShrinkPercentage">80</integer> + <!-- When items are dropped on the mini screens in customize mode, we have a bounce animation + of the bright green hover outline, and then fade out the outline at the end. These are + the values used in that animation --> + <integer name="config_screenOnDropScalePercent">120</integer> + <integer name="config_screenOnDropScaleUpDuration">200</integer> + <integer name="config_screenOnDropScaleDownDuration">200</integer> + <integer name="config_screenOnDropAlphaFadeDelay">350</integer> + <integer name="config_screenOnDropAlphaFadeDuration">50</integer> <!-- Fade/zoom in/out duration & scale in the AllApps transition. Note: This should be less than the workspaceShrinkTime as they happen together. --> |