diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
| commit | 680c92febe88260b74f101838a9734b8e10a704c (patch) | |
| tree | e3294c3b2b32cd3532fa9b239326b1aaaa79fc40 /res/values-sw720dp/config.xml | |
| parent | 494d2237b8d7b892902604c18098127e77372509 (diff) | |
| parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
| download | android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.gz android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.bz2 android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.zip | |
resolved conflicts for merge of 13ef17a3 to cw-e-dev
b/22609402
Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95
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> |