OSDN Git Service
Winson Chung [Mon, 2 Dec 2013 22:49:28 +0000 (22:49 +0000)]
Merge "Modifying Workspace padding to account for Search Bar offsets. (Bug
11968598)" into jb-ub-now-jolly-elf
Winson Chung [Mon, 2 Dec 2013 22:43:44 +0000 (14:43 -0800)]
Modifying Workspace padding to account for Search Bar offsets. (Bug
11968598)
Change-Id: I26b8488afd6d75777e1d881f1105b5c1a89021d7
Michael Jurka [Mon, 2 Dec 2013 22:17:48 +0000 (22:17 +0000)]
Merge "Use AsyncTasks instead of creating new threads" into jb-ub-now-jolly-elf
Mac Duy Hai [Mon, 2 Dec 2013 11:40:17 +0000 (11:40 +0000)]
Merge "Add method to retrieve search box bounds." into jb-ub-now-jolly-elf
Mac Duy Hai [Thu, 28 Nov 2013 16:17:33 +0000 (16:17 +0000)]
Add method to retrieve search box bounds.
Change-Id: I67893f00990053415453490034ea7066d9f0f3b6
Adam Cohen [Wed, 27 Nov 2013 21:05:59 +0000 (21:05 +0000)]
Merge "Fix binding problem with no screens (issue
11768766)" into jb-ub-now-jolly-elf
Adam Cohen [Wed, 27 Nov 2013 19:55:48 +0000 (11:55 -0800)]
Fix binding problem with no screens (issue
11768766)
Change-Id: I0a296892d4964913f38bf6d7bd2c2b17e1e0e8e0
Adam Cohen [Tue, 26 Nov 2013 23:45:38 +0000 (15:45 -0800)]
Update custom content insets when Workspace insets are set
-> Not sure if custom content can be added before insets are set,
so this is just a speculative fix.
Bug:
11875171
Change-Id: Ia8e07f51f527f464262b7ff99e4db245fe5a7906
Adam Cohen [Tue, 26 Nov 2013 22:55:45 +0000 (14:55 -0800)]
De-parent custom content view before adding to custom content screen
Bug:
11666352
Change-Id: Ief35e6e8a16ec0217e0dd27434723ee7a7d5beef
Adam Cohen [Tue, 26 Nov 2013 20:13:11 +0000 (12:13 -0800)]
Fix NPE in Launcher onDestroy
Bug:
11765296
Change-Id: I83299656cc90b8a744afb0db4b5ea08675c8db82
Adam Cohen [Tue, 26 Nov 2013 19:57:09 +0000 (19:57 +0000)]
Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf
Adam Cohen [Tue, 26 Nov 2013 19:50:15 +0000 (11:50 -0800)]
Fix NPE in case where workspace is null because Launcher has been destroyed
Bug:
11765964
Change-Id: Iacd4db712c09940c05ccd2a64b25e376b63c6aee
Dan Sandler [Tue, 26 Nov 2013 17:48:01 +0000 (12:48 -0500)]
Revert "Enable Launcher2 workspace import."
This reverts commit
5b3bdd394e4401d7e91d528ef1d424d1af271d97.
Bug:
11768766
Bug:
9832552
Michael Jurka [Tue, 26 Nov 2013 13:35:40 +0000 (13:35 +0000)]
Merge "Making workspace->overview transition smoother" into jb-ub-now-jolly-elf
Adam Cohen [Mon, 25 Nov 2013 18:46:23 +0000 (18:46 +0000)]
Merge "Allowing ability to pick up items / enter overview before full page settle" into jb-ub-now-jolly-elf
Michael Jurka [Mon, 25 Nov 2013 13:32:21 +0000 (14:32 +0100)]
Making workspace->overview transition smoother
- Also set interpolator on page indicators
Dan Sandler [Thu, 21 Nov 2013 13:29:51 +0000 (08:29 -0500)]
Enable Launcher2 workspace import.
Bug:
11800663
Change-Id: I5c8963bde69e667bf726d1f926a913c347294e16
Winson Chung [Tue, 19 Nov 2013 23:10:12 +0000 (15:10 -0800)]
Reducing workspace grid for dogfooding.
Winson Chung [Tue, 19 Nov 2013 20:02:19 +0000 (20:02 +0000)]
Merge "Update the database when converting the final screen. (Bug
11683562, Bug
11034205)" into jb-ub-now-jolly-elf
Dan Sandler [Tue, 19 Nov 2013 17:21:25 +0000 (12:21 -0500)]
Disable importing workspaces from Launcher2.
Bug:
9832552
Bug:
11761032
Change-Id: I4dfd16046e9d6d0d1d864dff4340b0ed13cc8b8f
Winson Chung [Tue, 19 Nov 2013 00:09:54 +0000 (16:09 -0800)]
Update the database when converting the final screen. (Bug
11683562, Bug
11034205)
Winson Chung [Mon, 18 Nov 2013 22:12:11 +0000 (22:12 +0000)]
Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf
* changes:
Initialize FastBitmapDrawable bounds with default bitmap dimensions.
Updating LauncherModel filtering to use screen ids. (Bug
11685286)
Winson Chung [Mon, 18 Nov 2013 22:04:41 +0000 (14:04 -0800)]
Initialize FastBitmapDrawable bounds with default bitmap dimensions.
Change-Id: Ida9603e35b242a581b9401c6440875cd511725a1
Adam Cohen [Mon, 18 Nov 2013 20:06:55 +0000 (20:06 +0000)]
Allowing ability to pick up items / enter overview before full page settle
-> Fixes issue
11701996
-> Fixes issue where if you tried to longpress a widget before the page
settled, it would instead enter overview
Change-Id: Ic6321805687dd5e8c69506c6cd6941a11d557ed6
Adam Cohen [Fri, 8 Nov 2013 14:45:03 +0000 (06:45 -0800)]
Syncing up state transition with paging transition
Change-Id: Id91e4c046cfe7d9aa6e7de10dbf57ee727ba160e
Winson Chung [Fri, 15 Nov 2013 23:39:34 +0000 (15:39 -0800)]
Updating LauncherModel filtering to use screen ids. (Bug
11685286)
- Fixes the issue with the current page not synchronously binding
Change-Id: I3dfa45cc1777f846c77f3e86059dfb715553e1a3
Winson Chung [Fri, 15 Nov 2013 21:27:34 +0000 (21:27 +0000)]
Merge "Additional logs to track down missing workspace screen. (Bug
11683562)" into jb-ub-now-jolly-elf
Winson Chung [Fri, 15 Nov 2013 21:27:00 +0000 (13:27 -0800)]
Additional logs to track down missing workspace screen. (Bug
11683562)
Change-Id: I4f6b3c3ae07e2069bad01940dfce6bdc9cdb0ae0
Winson Chung [Fri, 15 Nov 2013 21:11:22 +0000 (21:11 +0000)]
Merge "Adding logs to track down missing workspace screen. (Bug
11683562)" into jb-ub-now-jolly-elf
Winson Chung [Fri, 15 Nov 2013 21:05:06 +0000 (13:05 -0800)]
Adding logs to track down missing workspace screen. (Bug
11683562)
Change-Id: I12ef3331ab81004c75229d33afa0a8dd0fa8521c
Adam Cohen [Fri, 15 Nov 2013 17:09:22 +0000 (17:09 +0000)]
Merge "Adding method to get the search bar bounds." into jb-ub-now-jolly-elf
Adam Cohen [Fri, 15 Nov 2013 16:51:22 +0000 (16:51 +0000)]
Bit of code cleanup (issue
11648206)
Change-Id: I2d04bbbdb037de089a16da236dadc4f5950504da
Adam Cohen [Fri, 15 Nov 2013 13:21:04 +0000 (13:21 +0000)]
Merge "Fix for transparent CustomContent screen (issue
11549096)" into jb-ub-now-jolly-elf
Adam Cohen [Fri, 15 Nov 2013 10:56:16 +0000 (10:56 +0000)]
Fix for transparent CustomContent screen (issue
11549096)
Change-Id: I8b371e3c556a80b7eb3e145a8d4b78f15421046a
Winson Chung [Thu, 24 Oct 2013 18:01:54 +0000 (11:01 -0700)]
Adding method to get the search bar bounds.
Change-Id: Iec2fe0992cc666432ba6b9eac7ee8bf63e49b146
Winson Chung [Thu, 14 Nov 2013 19:50:28 +0000 (19:50 +0000)]
Merge "Require valid arrays when adding and binding new Apps. (Bug
11627095)" into jb-ub-now-jolly-elf
Winson Chung [Thu, 14 Nov 2013 19:30:05 +0000 (11:30 -0800)]
Require valid arrays when adding and binding new Apps. (Bug
11627095)
Change-Id: I8f2a4dc70bf376d804885f433ab20064823ebaac
Winson Chung [Thu, 14 Nov 2013 19:19:24 +0000 (19:19 +0000)]
Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf
Winson Chung [Wed, 13 Nov 2013 23:47:05 +0000 (15:47 -0800)]
Use the icon bounds for all calculations.
- Fixes a drag and drop issue when the dynamic
grid scales icons down, due to the drawable bounds
not being equal to their bitmap sizes.
Change-Id: If7c68b51131de7bac3195a2619e22340f7789432
Adam Cohen [Thu, 14 Nov 2013 17:10:57 +0000 (17:10 +0000)]
Merge "Fix issue where custom content would be invisible (issue
11644432)" into jb-ub-now-jolly-elf
Adam Cohen [Thu, 14 Nov 2013 16:43:59 +0000 (16:43 +0000)]
Fix issue where custom content would be invisible (issue
11644432)
-> Also making sure to clear the widget frame when moving to custom
content.
Change-Id: I460c707f1b6ec34bc6d78c9df43a613d9bfced3c
Adam Cohen [Thu, 14 Nov 2013 16:22:36 +0000 (16:22 +0000)]
Merge "Change the way view ids are assigned (issue
11627801)" into jb-ub-now-jolly-elf
Adam Cohen [Thu, 14 Nov 2013 11:09:14 +0000 (11:09 +0000)]
Change the way view ids are assigned (issue
11627801)
Change-Id: I4d9c0542ea3ac581c4a9f4da68824f0b498ea337
Adam Copp [Thu, 14 Nov 2013 14:04:44 +0000 (14:04 +0000)]
Merge "Hooks for subclasses to react to home presses." into jb-ub-now-jolly-elf
Michael Jurka [Thu, 14 Nov 2013 11:03:58 +0000 (12:03 +0100)]
Use AsyncTasks instead of creating new threads
Change-Id: If166869dfbeb84d4dee2203f5b98a22b9d20719d
Adam Cohen [Wed, 13 Nov 2013 11:46:26 +0000 (11:46 +0000)]
Merge "Add logging for NPE (issue
11627249)" into jb-ub-now-jolly-elf
Adam Copp [Tue, 12 Nov 2013 16:26:04 +0000 (16:26 +0000)]
Hooks for subclasses to react to home presses.
This provides the nessecary hooks for GEL so that it can prevent
scrolling to the home screen when a search is open, instead choosing to
dismiss the search.
Bug:
11128544
Change-Id: I3c1b67bc271c1342db4a0abac364f2923bdeba3a
Adam Cohen [Wed, 13 Nov 2013 11:36:03 +0000 (11:36 +0000)]
Merge "Fix CellLayout UNSPECIFIED exception (issue
11627191)" into jb-ub-now-jolly-elf
Adam Cohen [Wed, 13 Nov 2013 11:29:49 +0000 (11:29 +0000)]
Add logging for NPE (issue
11627249)
Change-Id: I75352f9eb1249fa5cc46d05cd7c168a868c6f7b7
Winson Chung [Tue, 12 Nov 2013 19:37:07 +0000 (19:37 +0000)]
Merge "Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug
11439120)" into jb-ub-now-jolly-elf
Adam Cohen [Tue, 12 Nov 2013 11:33:14 +0000 (11:33 +0000)]
Fix CellLayout UNSPECIFIED exception (issue
11627191)
Change-Id: Id2f840a804c51e8c61bb28882796059584e4c8bb
Adam Cohen [Tue, 12 Nov 2013 11:44:58 +0000 (11:44 +0000)]
Fix issue where extra page hangs around (issue
11634172)
Change-Id: Ia0900c9fc07bc587259e36ed17816eaf519b10dc
Adam Cohen [Tue, 12 Nov 2013 10:43:13 +0000 (10:43 +0000)]
Merge "Small tweaks to custom content management" into jb-ub-now-jolly-elf
Winson Chung [Mon, 11 Nov 2013 23:47:45 +0000 (15:47 -0800)]
Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug
11439120)
Change-Id: I21173f114228ba43172af9074d2ac1fadeee9886
Michael Jurka [Mon, 11 Nov 2013 20:07:03 +0000 (20:07 +0000)]
Merge "Fix wallpaper cropping bugs" into jb-ub-now-jolly-elf
Adam Cohen [Mon, 11 Nov 2013 18:49:56 +0000 (18:49 +0000)]
Small tweaks to custom content management
-> Never allow the custom content overhang onto the viewport when
it is not the current page
-> Never fade the custom content screen as a consequence of scrolling
Change-Id: I91a4cfb3f740ee8b429084fce1c96258bac8dd9e
Michael Jurka [Mon, 11 Nov 2013 15:44:44 +0000 (16:44 +0100)]
Fix wallpaper cropping bugs
- take into account that image decoder might not
respect inSampleSize
- check rounded values so we don't have crop rects
that lie outside a bitmap's dimensions
- correctly set initial scale on bitmaps that are
larger than the screen size
Change-Id: I42be79c68b883a6e329dcc5645d7db6cd6e3eeeb
Adam Cohen [Mon, 11 Nov 2013 15:37:21 +0000 (15:37 +0000)]
Fix NPE we're seeing in feedback (issue
11626428)
Change-Id: I848ca84b325339004ba8ea50a01f5240eea356f5
Adam Cohen [Mon, 11 Nov 2013 14:00:56 +0000 (14:00 +0000)]
Add method to determine if Launcher is using vertical bars
Change-Id: I7e9096cf81b49d213025c6f98708186330448fc0
Michael Jurka [Fri, 8 Nov 2013 16:32:57 +0000 (16:32 +0000)]
Merge "Uncommenting throw when item not contained in sBgItemsIdMap" into jb-ub-now-jolly-elf
Adam Cohen [Fri, 8 Nov 2013 16:25:08 +0000 (08:25 -0800)]
Uncommenting throw when item not contained in sBgItemsIdMap
-> Improving logging for issue
11580149
Change-Id: I10ce7c4b54a6435302d33bbeba4e8600f69d4920
Michael Jurka [Fri, 8 Nov 2013 16:17:24 +0000 (08:17 -0800)]
am
5bfab60f: Fix NPE in Live Wallpaper loader
* commit '
5bfab60fff6c3da8f8d8e245a496a031f807560d':
Fix NPE in Live Wallpaper loader
Michael Jurka [Fri, 8 Nov 2013 15:59:11 +0000 (16:59 +0100)]
Fix NPE in Live Wallpaper loader
Bug:
11584868
Adam Cohen [Fri, 8 Nov 2013 15:33:22 +0000 (07:33 -0800)]
am
3428b5e9: Merge "Fix default wallpaper thumbnail" into jb-ub-now-jetsonic
* commit '
3428b5e9f944e476fa4e5230dc682242198309ce':
Fix default wallpaper thumbnail
Adam Cohen [Fri, 8 Nov 2013 15:31:04 +0000 (15:31 +0000)]
Merge "Fix default wallpaper thumbnail" into jb-ub-now-jetsonic
Adam Cohen [Fri, 8 Nov 2013 15:29:13 +0000 (07:29 -0800)]
am
2da0a053: Fix small scrolling regression
* commit '
2da0a0532752fae8985e3e8a192eb5087cf78aab':
Fix small scrolling regression
Michael Jurka [Fri, 8 Nov 2013 14:45:48 +0000 (15:45 +0100)]
Fix default wallpaper thumbnail
Bug:
11588279
Adam Cohen [Fri, 8 Nov 2013 14:28:17 +0000 (06:28 -0800)]
Fix small scrolling regression
-> only cancel scrolling when necessary to avoid
unnecessary snapToDestination() calls
Change-Id: I406bef2453c88d61d25f66be67205ab8fbd69ec9
Winson Chung [Thu, 7 Nov 2013 18:52:18 +0000 (18:52 +0000)]
Merge "Save and restore the correct content type when rotating while in AllApps." into jb-ub-now-jolly-elf
Winson Chung [Thu, 7 Nov 2013 18:51:57 +0000 (18:51 +0000)]
Merge "Fixing crash while reordering pages in OverviewMode." into jb-ub-now-jolly-elf
Winson Chung [Wed, 6 Nov 2013 21:23:29 +0000 (13:23 -0800)]
Dyanmically lay out overview mode across all orientations and form factors.
Change-Id: I788bbf289717b30b19afc9ad9d611c85715bc623
Winson Chung [Wed, 6 Nov 2013 22:49:50 +0000 (14:49 -0800)]
Fixing crash while reordering pages in OverviewMode.
Change-Id: I67dcd71a8f15fbc737880306254c766f4dbadc58
Winson Chung [Wed, 6 Nov 2013 23:49:51 +0000 (15:49 -0800)]
Save and restore the correct content type when rotating while in AllApps.
Change-Id: I508832e46c8a2ab3bb53baf8f44b543c4c24aed2
Adam Cohen [Thu, 7 Nov 2013 17:00:58 +0000 (09:00 -0800)]
am
a1648449: Fixing tiny regression in PagedView spacing
* commit '
a1648449901178da191564a0dd9ecbdf9f971e69':
Fixing tiny regression in PagedView spacing
Michael Jurka [Thu, 7 Nov 2013 12:42:03 +0000 (12:42 +0000)]
Merge "Revert "Workaround for remove stuck (issue
11080792)"" into jb-ub-now-jolly-elf
Michael Jurka [Wed, 6 Nov 2013 15:37:34 +0000 (16:37 +0100)]
Revert "Workaround for remove stuck (issue
11080792)"
This reverts commit
f72693d907c67a539cdb6643f157fc0ba28c4268.
Michael Jurka [Wed, 6 Nov 2013 16:06:57 +0000 (17:06 +0100)]
Don't adjust animation play time if not necessary
Potential fix for Bug:
11080792
Adam Cohen [Thu, 7 Nov 2013 12:11:15 +0000 (04:11 -0800)]
Fixing tiny regression in PagedView spacing
Change-Id: I7dde2257e6079d540d648fa57a15cf865d594f35
Baligh Uddin [Thu, 7 Nov 2013 04:11:08 +0000 (20:11 -0800)]
am
89fbe00d: (-s ours) am
0491f0f1: (-s ours) Import translations. DO NOT MERGE
* commit '
89fbe00de978c9620e71a030fa0f16cecfd38b3a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:06:07 +0000 (20:06 -0800)]
am
0491f0f1: (-s ours) Import translations. DO NOT MERGE
* commit '
0491f0f16d528179206623a086a353f62863df88':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Nov 2013 04:04:51 +0000 (20:04 -0800)]
am
e0b9a1f7: (-s ours) Import translations. DO NOT MERGE
* commit '
e0b9a1f72415cdb119356901fd66f5b35115747e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 6 Nov 2013 23:16:57 +0000 (15:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I077655685f6faa46c09db6f7d7384aaddb08c9f7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 6 Nov 2013 23:16:19 +0000 (15:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I58918dca0bb241091f9b8d14e5062d2581ab6e11
Auto-generated-cl: translation import
Baligh Uddin [Wed, 6 Nov 2013 23:15:41 +0000 (15:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6caa0d5f1cda02e40d94d6182dc37342babc3013
Auto-generated-cl: translation import
Baligh Uddin [Tue, 5 Nov 2013 23:23:28 +0000 (15:23 -0800)]
am
2a44d878: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic
* commit '
2a44d878b7ac0cf4b3dba5a7800bed984f87d677':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 23:21:50 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf
Baligh Uddin [Tue, 5 Nov 2013 23:21:46 +0000 (23:21 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic
Adam Cohen [Tue, 5 Nov 2013 02:30:09 +0000 (18:30 -0800)]
am
b2af6076: Merge "Ensuring that widget ids are cleaned up" into jb-ub-now-jetsonic
* commit '
b2af6076c70cd3d09e23a4999803b3108aa469f4':
Ensuring that widget ids are cleaned up
Adam Cohen [Tue, 5 Nov 2013 02:26:31 +0000 (02:26 +0000)]
Merge "Ensuring that widget ids are cleaned up" into jb-ub-now-jetsonic
Adam Cohen [Tue, 5 Nov 2013 02:21:24 +0000 (18:21 -0800)]
Ensuring that widget ids are cleaned up
Change-Id: I89f7bd3fccdc730128189beb51680e3ee76e3524
Adam Cohen [Tue, 5 Nov 2013 02:14:59 +0000 (18:14 -0800)]
am
c18e4a92: Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic
* commit '
c18e4a926530cf458bdc67abfdd60488ff62d758':
Fix bug where cancelling config activity leaves user stuck in bad state
Adam Cohen [Tue, 5 Nov 2013 02:10:36 +0000 (02:10 +0000)]
Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic
Adam Cohen [Tue, 5 Nov 2013 01:57:36 +0000 (17:57 -0800)]
Fix bug where cancelling config activity leaves user stuck in bad state
Change-Id: I774cc6e46006f623c97812c85023b228128430fe
Adam Cohen [Tue, 5 Nov 2013 00:44:55 +0000 (16:44 -0800)]
am
5c6474da: Merge "Fix problem with where PagedView could get stuck (issue
11314889)" into jb-ub-now-jetsonic
* commit '
5c6474da600dc828805d86e50ce357bee908131b':
Fix problem with where PagedView could get stuck (issue
11314889)
Adam Cohen [Tue, 5 Nov 2013 00:40:20 +0000 (00:40 +0000)]
Merge "Fix problem with where PagedView could get stuck (issue
11314889)" into jb-ub-now-jetsonic
Baligh Uddin [Tue, 5 Nov 2013 00:35:24 +0000 (16:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idd188b56c6fc58f3b16175cfa59bcc2c0a1647b8
Auto-generated-cl: translation import
Baligh Uddin [Tue, 5 Nov 2013 00:34:37 +0000 (16:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iaa83f30cfeeab4760d809bdb6f5e7ec3c650ee21
Auto-generated-cl: translation import
Adam Cohen [Mon, 4 Nov 2013 22:42:52 +0000 (14:42 -0800)]
Fix problem with where PagedView could get stuck (issue
11314889)
-> Also a small code cleanup where something was very weird
Change-Id: I3612e1de924a83d1a91b752f3b9e1e239a8db0ea
Adam Cohen [Sat, 2 Nov 2013 00:26:31 +0000 (17:26 -0700)]
am
829f37f3: Merge "Workaround for remove stuck (issue
11080792)" into jb-ub-now-jetsonic
* commit '
829f37f3a02a66cd88967cf021e0a96308e49d4b':
Workaround for remove stuck (issue
11080792)
Winson Chung [Sat, 2 Nov 2013 00:26:31 +0000 (17:26 -0700)]
am
e494aaf7: Merge "Initial changes to support AllApps on various form factors." into jb-ub-now-jetsonic
* commit '
e494aaf70fbe95d0fb7e0b64736f28884b044713':
Initial changes to support AllApps on various form factors.