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-sw600dp/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-sw600dp/config.xml')
| -rw-r--r-- | res/values-sw600dp/config.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml index 15d5725d1..a7345a705 100644 --- a/res/values-sw600dp/config.xml +++ b/res/values-sw600dp/config.xml @@ -4,8 +4,4 @@ <!-- DragController --> <integer name="config_flingToDeleteMinVelocity">-1000</integer> - - <!-- Camera distance for the overscroll effect. We use a higher value here because the - workspace screens run nearly flush to the edge of the screen--> - <integer name="config_cameraDistance">14000</integer> </resources> |