diff options
| author | Winson Chung <winsonc@google.com> | 2013-12-12 00:35:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-12 00:35:47 +0000 |
| commit | b6147f85786c78b3608eabf2286cd9e61c28878d (patch) | |
| tree | 7042bdad7c4b9d09b7b2b89afd9ea958b101e547 /res | |
| parent | 1239b9da8901f1384aa30f88f8b660078d37ea82 (diff) | |
| parent | 59a488ac03aa122b75e9a358db74acf7bb4d2508 (diff) | |
| download | android_packages_apps_Trebuchet-b6147f85786c78b3608eabf2286cd9e61c28878d.tar.gz android_packages_apps_Trebuchet-b6147f85786c78b3608eabf2286cd9e61c28878d.tar.bz2 android_packages_apps_Trebuchet-b6147f85786c78b3608eabf2286cd9e61c28878d.zip | |
Merge "Adjusting grid for tablets and fixing incorrect resources for large tablets." into jb-ub-now-kermit
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-sw720dp-hdpi/workspace_bg.9.png | bin | 0 -> 226 bytes | |||
| -rw-r--r-- | res/drawable-sw720dp-mdpi/workspace_bg.9.png | bin | 0 -> 213 bytes | |||
| -rw-r--r-- | res/drawable-sw720dp-xhdpi/workspace_bg.9.png | bin | 0 -> 255 bytes | |||
| -rw-r--r-- | res/drawable-sw720dp-xxhdpi/workspace_bg.9.png | bin | 0 -> 1126 bytes | |||
| -rw-r--r-- | res/values-land/config.xml | 2 | ||||
| -rw-r--r-- | res/values-sw340dp-port/config.xml | 3 | ||||
| -rw-r--r-- | res/values-sw720dp/config.xml | 2 | ||||
| -rw-r--r-- | res/values/config.xml | 2 |
8 files changed, 0 insertions, 9 deletions
diff --git a/res/drawable-sw720dp-hdpi/workspace_bg.9.png b/res/drawable-sw720dp-hdpi/workspace_bg.9.png Binary files differnew file mode 100644 index 000000000..5bbfa4fff --- /dev/null +++ b/res/drawable-sw720dp-hdpi/workspace_bg.9.png diff --git a/res/drawable-sw720dp-mdpi/workspace_bg.9.png b/res/drawable-sw720dp-mdpi/workspace_bg.9.png Binary files differnew file mode 100644 index 000000000..2856e0985 --- /dev/null +++ b/res/drawable-sw720dp-mdpi/workspace_bg.9.png diff --git a/res/drawable-sw720dp-xhdpi/workspace_bg.9.png b/res/drawable-sw720dp-xhdpi/workspace_bg.9.png Binary files differnew file mode 100644 index 000000000..72269f207 --- /dev/null +++ b/res/drawable-sw720dp-xhdpi/workspace_bg.9.png diff --git a/res/drawable-sw720dp-xxhdpi/workspace_bg.9.png b/res/drawable-sw720dp-xxhdpi/workspace_bg.9.png Binary files differnew file mode 100644 index 000000000..efc9b0465 --- /dev/null +++ b/res/drawable-sw720dp-xxhdpi/workspace_bg.9.png diff --git a/res/values-land/config.xml b/res/values-land/config.xml index 121bb0c14..31115c9cb 100644 --- a/res/values-land/config.xml +++ b/res/values-land/config.xml @@ -18,6 +18,4 @@ <!-- Workspace --> <!-- Whether or not the drop targets drop down as opposed to fade in --> <bool name="config_useDropTargetDownTransition">false</bool> - <!-- Whether or not to fade the side pages --> - <bool name="config_workspaceFadeAdjacentScreens">false</bool> </resources> diff --git a/res/values-sw340dp-port/config.xml b/res/values-sw340dp-port/config.xml index d31ee5969..5f71077c7 100644 --- a/res/values-sw340dp-port/config.xml +++ b/res/values-sw340dp-port/config.xml @@ -15,7 +15,4 @@ --> <resources> -<!-- Workspace --> - <!-- Whether or not to fade the side pages --> - <bool name="config_workspaceFadeAdjacentScreens">false</bool> </resources> diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml index 4f537a9f4..c00b5943f 100644 --- a/res/values-sw720dp/config.xml +++ b/res/values-sw720dp/config.xml @@ -9,8 +9,6 @@ <!-- Workspace --> <!-- Whether or not the drop targets drop down as opposed to fade in --> <bool name="config_useDropTargetDownTransition">false</bool> - <!-- Whether or not to fade the side pages --> - <bool name="config_workspaceFadeAdjacentScreens">true</bool> <!-- Camera distance for the overscroll effect --> <integer name="config_cameraDistance">18000</integer> diff --git a/res/values/config.xml b/res/values/config.xml index 1538d9fab..2a0821662 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -52,8 +52,6 @@ <!-- Workspace --> <!-- Whether or not the drop targets drop down as opposed to fade in --> <bool name="config_useDropTargetDownTransition">false</bool> - <!-- Whether or not to fade the side pages --> - <bool name="config_workspaceFadeAdjacentScreens">false</bool> <!-- The transition duration for the background of the drop targets --> <integer name="config_dropTargetBgTransitionDuration">0</integer> |
