diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-21 17:01:26 -0700 |
|---|---|---|
| committer | Ed Heyl <edheyl@google.com> | 2015-07-22 11:31:04 -0700 |
| commit | e612775922ec9f8cc4e5cb976bc62b3312a3de0e (patch) | |
| tree | 96beaf07307486f6491f022da63ebe381765d1a8 /res/values-sw720dp/config.xml | |
| parent | a83129f0bc778fd1ccd799bd8cfa40270f632e1d (diff) | |
| download | android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.gz android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.bz2 android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.zip | |
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
Diffstat (limited to 'res/values-sw720dp/config.xml')
| -rw-r--r-- | res/values-sw720dp/config.xml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml index c00b5943f..94cffcb55 100644 --- a/res/values-sw720dp/config.xml +++ b/res/values-sw720dp/config.xml @@ -2,17 +2,10 @@ <bool name="config_largeHeap">true</bool> <bool name="is_large_tablet">true</bool> -<!-- AllApps/Customize/AppsCustomize --> +<!-- All Apps & Widgets --> <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. --> <integer name="config_workspaceSpringLoadShrinkPercentage">90</integer> -<!-- Workspace --> - <!-- Whether or not the drop targets drop down as opposed to fade in --> - <bool name="config_useDropTargetDownTransition">false</bool> - - <!-- Camera distance for the overscroll effect --> - <integer name="config_cameraDistance">18000</integer> - <!-- Hotseat --> <bool name="hotseat_transpose_layout_with_orientation">false</bool> </resources> |