diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-20 21:30:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-20 21:30:12 +0000 |
commit | 2e7e5776d26cb29d4b23879c699e1b1c510a48d4 (patch) | |
tree | e5f869d24b19fcf9d72985c4719e44a27b700e2e /res | |
parent | 17fa39222d87e97b25e1016e3b780fda72aa3425 (diff) | |
parent | 756cd26592dee6b956becdc24d60995c64de9153 (diff) | |
download | android_packages_apps_Trebuchet-2e7e5776d26cb29d4b23879c699e1b1c510a48d4.tar.gz android_packages_apps_Trebuchet-2e7e5776d26cb29d4b23879c699e1b1c510a48d4.tar.bz2 android_packages_apps_Trebuchet-2e7e5776d26cb29d4b23879c699e1b1c510a48d4.zip |
Merge "General code refactoring > Removing utility method for isAttachedToWindow > Moving logic to calculate cell size from workspace to DeviceProfile > Replacing some constants with xml resource variables > Saving the item info using content values for better compatibility with other methods" into ub-launcher3-master
Diffstat (limited to 'res')
-rw-r--r-- | res/values-sw600dp/config.xml | 3 | ||||
-rw-r--r-- | res/values-sw600dp/dimens.xml | 6 | ||||
-rw-r--r-- | res/values/config.xml | 1 | ||||
-rw-r--r-- | res/values/dimens.xml | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml index a7345a705..eb9af9793 100644 --- a/res/values-sw600dp/config.xml +++ b/res/values-sw600dp/config.xml @@ -1,7 +1,4 @@ <resources> <bool name="is_tablet">true</bool> <bool name="allow_rotation">true</bool> - -<!-- DragController --> - <integer name="config_flingToDeleteMinVelocity">-1000</integer> </resources> diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 2651fbb3f..c1ac9aa44 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -28,4 +28,10 @@ <dimen name="cling_migration_content_margin">64dp</dimen> <dimen name="cling_migration_content_width">280dp</dimen> +<!-- Widget tray --> + <dimen name="widget_section_indent">56dp</dimen> + + +<!-- DragController --> + <dimen name="drag_flingToDeleteMinVelocity">-1000dp</dimen> </resources> diff --git a/res/values/config.xml b/res/values/config.xml index 0f18dffb8..6a6784015 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -17,7 +17,6 @@ <bool name="enable_backup">false</bool> <!-- DragController --> - <integer name="config_flingToDeleteMinVelocity">-1500</integer> <item type="id" name="drag_event_parity" /> <!-- AllApps & Launcher transitions --> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 3f141513f..54308721e 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -85,6 +85,7 @@ <dimen name="widget_section_icon_size">40dp</dimen> <dimen name="widget_section_vertical_padding">8dp</dimen> <dimen name="widget_section_horizontal_padding">16dp</dimen> + <dimen name="widget_section_indent">0dp</dimen> <dimen name="widget_row_padding">8dp</dimen> <dimen name="widget_row_divider">2dp</dimen> @@ -111,6 +112,8 @@ and drop targets like all-apps and folders --> <dimen name="drag_elevation">30dp</dimen> + <dimen name="drag_flingToDeleteMinVelocity">-1500dp</dimen> + <!-- Theme --> <dimen name="quantum_panel_outer_padding">4dp</dimen> |