OSDN Git Service
Craig Mautner [Tue, 25 Mar 2014 22:57:33 +0000 (22:57 +0000)]
am
296f1a91: Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""
* commit '
296f1a9130cc5d5339ab1d1c3cfc7324920acf8a':
Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
Craig Mautner [Tue, 25 Mar 2014 22:57:29 +0000 (22:57 +0000)]
am
61ada5d3: Merge "Add Activity methods for icons and labels."
* commit '
61ada5d330e10a738ba5f085cae5b9b339895d19':
Add Activity methods for icons and labels.
John Spurlock [Tue, 25 Mar 2014 22:57:26 +0000 (22:57 +0000)]
am
9ae0c8ff: Merge "Add notification category for recommendations."
* commit '
9ae0c8ffba5ab50fb02d319a00e56fe42960cb4a':
Add notification category for recommendations.
Dianne Hackborn [Tue, 25 Mar 2014 22:57:23 +0000 (22:57 +0000)]
am
e9c9c441: Merge "Battery stats: track actually running time"
* commit '
e9c9c441346586e26eccc0523fcf12f5158e53f7':
Battery stats: track actually running time
Christopher Tate [Tue, 25 Mar 2014 22:57:20 +0000 (22:57 +0000)]
am
18a65ad0: Merge "Cap the size of app-defined permission trees"
* commit '
18a65ad09d9a245266874015e5aacb05d868a534':
Cap the size of app-defined permission trees
Winson Chung [Tue, 25 Mar 2014 22:57:18 +0000 (22:57 +0000)]
am
e9c77aee: Merge "Fixing crash with multiple touch pointers"
* commit '
e9c77aee60fbb781db916d32fe1db81e1d973f8f':
Fixing crash with multiple touch pointers
Matthew Williams [Tue, 25 Mar 2014 22:57:15 +0000 (22:57 +0000)]
am
cde7086b: Merge "Downgrade expedited to normal on reschedule."
* commit '
cde7086b900fd192a8e389f62ab5007d351d86b8':
Downgrade expedited to normal on reschedule.
Paul Lawrence [Tue, 25 Mar 2014 22:57:11 +0000 (22:57 +0000)]
am
717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting"
* commit '
717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7':
Don't prompt at boot if we already did that when decrypting
Jinsuk Kim [Tue, 25 Mar 2014 22:57:08 +0000 (22:57 +0000)]
Colin Cross [Tue, 25 Mar 2014 22:57:03 +0000 (22:57 +0000)]
am
8a60ded0: Merge "resolved conflicts for merge of
a67e34c8 to master"
* commit '
8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2':
Add HDMI-CEC service
Bo Liu [Tue, 25 Mar 2014 22:56:59 +0000 (22:56 +0000)]
am
caf94773: Merge "Convert a attach/detach functor in ViewRootImpl to x64"
* commit '
caf947737d3e94d2f5d839ec1fa951df7937fdb2':
Convert a attach/detach functor in ViewRootImpl to x64
Adam Cohen [Tue, 25 Mar 2014 22:56:57 +0000 (22:56 +0000)]
am
fb40d78c: Merge "Catch exceptions if Exif is malformed"
* commit '
fb40d78c57711585c9eaed467601bf3adb4f60f9':
Catch exceptions if Exif is malformed
Adam Cohen [Tue, 25 Mar 2014 22:56:54 +0000 (22:56 +0000)]
am
146af201: Merge "Catching security exception when activity destroyed"
* commit '
146af201d380cffa6a540fd0d52590bd9d30b614':
Catching security exception when activity destroyed
John Spurlock [Tue, 25 Mar 2014 22:56:51 +0000 (22:56 +0000)]
am
3daafcd7: Merge "Annotate framework vibrate calls with stream hints."
* commit '
3daafcd7bab6e3ace72396576529e3049ab4c066':
Annotate framework vibrate calls with stream hints.
Selim Cinek [Tue, 25 Mar 2014 22:56:48 +0000 (22:56 +0000)]
am
a4c1ccf3: Merge "Disable Set Wallpaper button while loading image"
* commit '
a4c1ccf3e045accd321be4d4c7d2ba1941a49ab4':
Disable Set Wallpaper button while loading image
Craig Mautner [Tue, 25 Mar 2014 22:56:45 +0000 (22:56 +0000)]
am
f7ad8557: Apply FLAG_SHOW_WHEN_LOCKED within tasks.
* commit '
f7ad855718dc576a1618a54035b82e92356aa0d8':
Apply FLAG_SHOW_WHEN_LOCKED within tasks.
Baligh Uddin [Tue, 25 Mar 2014 18:56:29 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev
Baligh Uddin [Mon, 24 Mar 2014 17:35:45 +0000 (10:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6b17ae8cdd6740b183db0b35aa60e8013e1cafdd
Auto-generated-cl: translation import
Baligh Uddin [Mon, 24 Mar 2014 17:24:12 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I283e5bfd2556dd506cc9cf9ad15bb25cda5904ea
Auto-generated-cl: translation import
Craig Mautner [Sun, 23 Mar 2014 01:20:41 +0000 (01:20 +0000)]
Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks.""
Craig Mautner [Sun, 23 Mar 2014 00:10:33 +0000 (00:10 +0000)]
Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
This reverts commit
f7ad855718dc576a1618a54035b82e92356aa0d8.
After careful consideration this would prove to be a security leak to leave it in. Tasks could deliberately launch dialog activities that don't want to be seen in an unsecure setting. These would then be visible over the task background.
Change-Id: Ia7e984bc9616573af6c7772f6ea0f2dd588bb85d
Craig Mautner [Sat, 22 Mar 2014 23:44:37 +0000 (23:44 +0000)]
Merge "Add Activity methods for icons and labels."
Craig Mautner [Fri, 21 Mar 2014 16:34:07 +0000 (09:34 -0700)]
Add Activity methods for icons and labels.
New Activity methods setRecentsLabel(CharSequence) and
setRecentsIcon(Bitmap) have been added. The topmost
activity with either of these set will be returned in
RecentTaskInfo members activityLabel and activityIcon.
Fixes bug
13562992.
Change-Id: Ic15d1d27b733b892a2a940063b105ac48f1ffee5
John Spurlock [Sat, 22 Mar 2014 01:35:46 +0000 (01:35 +0000)]
Merge "Add notification category for recommendations."
John Spurlock [Fri, 21 Mar 2014 17:30:57 +0000 (13:30 -0400)]
Add notification category for recommendations.
Change-Id: I3718b8273c3f901aee1b2c2cdc4fcdae25fadcad
Dianne Hackborn [Sat, 22 Mar 2014 00:26:19 +0000 (00:26 +0000)]
Merge "Battery stats: track actually running time"
Christopher Tate [Fri, 21 Mar 2014 23:32:58 +0000 (23:32 +0000)]
Merge "Cap the size of app-defined permission trees"
Dianne Hackborn [Fri, 21 Mar 2014 18:07:11 +0000 (11:07 -0700)]
Battery stats: track actually running time
Use the uptime while creating the battery stats history to
generate a new event indicating when the CPU is actually running.
We can do this in combination with the new event reporting when
the CPU comes awake, looking at the difference between the
uptime and elapsed time at that point to determine when it last
when to sleep.
Also use this information to generate a new set of aggregated
states, the uptime caused by each wake reason.
Finally use new radio down timestamp to adjust the times we
compute for radio use. Note that this information is not (yet)
being used to adjust how these are recorded in the history.
Change-Id: I723b3b526c8e7d64de0cac9d1193e04132d5a3e4
Winson Chung [Fri, 21 Mar 2014 23:03:15 +0000 (23:03 +0000)]
Merge "Fixing crash with multiple touch pointers"
Winson Chung [Fri, 21 Mar 2014 22:15:11 +0000 (15:15 -0700)]
Fixing crash with multiple touch pointers
- Adding support for force-reloading certain thumbnails (in prep for fix to Bug.
13587139)
- Use withLayer and withEndAction on ViewPropertyAnimator animations
- Ensuring that we close the notifications panel when we toggle recents
Change-Id: Ied2d841de42046fcb09fffb615156b07b4a67136
Christopher Tate [Fri, 21 Mar 2014 22:16:14 +0000 (15:16 -0700)]
Cap the size of app-defined permission trees
Bug
13529742
Change-Id: I46c2ebc39caf4a9eacbffbb35fc386c2a1cedc12
Matthew Williams [Fri, 21 Mar 2014 21:59:07 +0000 (21:59 +0000)]
Merge "Downgrade expedited to normal on reschedule."
Paul Lawrence [Fri, 21 Mar 2014 20:40:46 +0000 (20:40 +0000)]
Merge "Don't prompt at boot if we already did that when decrypting"
Jinsuk Kim [Fri, 21 Mar 2014 20:23:45 +0000 (20:23 +0000)]
Colin Cross [Fri, 21 Mar 2014 20:19:54 +0000 (20:19 +0000)]
Merge "resolved conflicts for merge of
a67e34c8 to master"
Colin Cross [Fri, 21 Mar 2014 20:11:02 +0000 (13:11 -0700)]
resolved conflicts for merge of
a67e34c8 to master
Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2
Bo Liu [Fri, 21 Mar 2014 20:00:34 +0000 (20:00 +0000)]
Merge "Convert a attach/detach functor in ViewRootImpl to x64"
Adam Cohen [Fri, 21 Mar 2014 19:55:53 +0000 (19:55 +0000)]
Merge "Catch exceptions if Exif is malformed"
Adam Cohen [Fri, 21 Mar 2014 19:54:54 +0000 (19:54 +0000)]
Merge "Catching security exception when activity destroyed"
John Spurlock [Fri, 21 Mar 2014 19:51:44 +0000 (19:51 +0000)]
Merge "Annotate framework vibrate calls with stream hints."
Selim Cinek [Fri, 21 Mar 2014 19:39:38 +0000 (19:39 +0000)]
Merge "Disable Set Wallpaper button while loading image"
Selim Cinek [Fri, 21 Mar 2014 19:32:34 +0000 (20:32 +0100)]
Catch exceptions if Exif is malformed
Bug:
11650650
Change-Id: Ie1680220fdb235a166a0eaa0a2309729f861865c
Selim Cinek [Fri, 21 Mar 2014 19:24:55 +0000 (20:24 +0100)]
Catching security exception when activity destroyed
Fixed a bug where an asynctask tried to load an image
even after the activity was destroyed leading to a
security exception since the permission could not be granted anymore.
Bug:
12760267
Change-Id: Ieffb10b1007f349371647512ffe4fe72433344e7
Craig Mautner [Fri, 21 Mar 2014 19:24:07 +0000 (12:24 -0700)]
Apply FLAG_SHOW_WHEN_LOCKED within tasks.
If the bottommost fullscreen window of a task has FLAG_SHOW_WHEN_LOCKED
set then show all windows of the task that are above that window.
Fixes bug
13558398.
Change-Id: Ied8ada54efbb079eaf375470b2eae749e5551c24
Chris Wren [Fri, 21 Mar 2014 19:10:50 +0000 (19:10 +0000)]
Merge "lower the heads up threshold to exactly PRIORITY_HIGH"
Chris Wren [Fri, 21 Mar 2014 18:31:05 +0000 (14:31 -0400)]
lower the heads up threshold to exactly PRIORITY_HIGH
Bug:
13452562
Change-Id: I945ce22fa7253ff84fcc3d72f4cb732921ba3489
Bo Liu [Fri, 21 Mar 2014 19:06:23 +0000 (12:06 -0700)]
Convert a attach/detach functor in ViewRootImpl to x64
Change-Id: I93c1df8abd0ecd1686e392cada099f9864926d33
Fabrice Di Meglio [Fri, 21 Mar 2014 18:38:58 +0000 (18:38 +0000)]
Merge "Add support for enabled state for SearchIndexableData"
Fabrice Di Meglio [Fri, 21 Mar 2014 02:46:13 +0000 (19:46 -0700)]
Add support for enabled state for SearchIndexableData
- add "enabled" member which tells if the data will be
included into the search results.
Change-Id: I17f8c4b289b21061f7fc47f4902343fecb5ddc2c
Selim Cinek [Fri, 21 Mar 2014 18:19:08 +0000 (19:19 +0100)]
Disable Set Wallpaper button while loading image
Bug:
13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
Adam Lesinski [Fri, 21 Mar 2014 16:51:12 +0000 (16:51 +0000)]
Merge "Reduce warning verbosity in aapt"
Jean-Michel Trivi [Fri, 21 Mar 2014 16:49:55 +0000 (16:49 +0000)]
Merge "AudioTrack write from ByteBuffer updates position"
Jean-Michel Trivi [Fri, 21 Mar 2014 00:02:31 +0000 (17:02 -0700)]
AudioTrack write from ByteBuffer updates position
Remove offset parameter.
Update buffer position when data is successfully written.
Bug
7919023
Change-Id: I1701532ef0a91e2ccecfc38b24de29bc4f64d035
John Spurlock [Fri, 21 Mar 2014 14:26:55 +0000 (14:26 +0000)]
Merge "Unhide notification category."
John Spurlock [Tue, 18 Mar 2014 20:41:57 +0000 (16:41 -0400)]
Unhide notification category.
Rename @hidden Notification.kind -> category, and flesh out
shared values. Now a single value.
Update framework references, remove unused SystemUpdateService
magic value unused since 2012.
Change-Id: If06d19ff3a8c3125fca1457f5d3c665e2939c66c
John Spurlock [Thu, 20 Mar 2014 02:09:06 +0000 (22:09 -0400)]
Annotate framework vibrate calls with stream hints.
Migrate existing framework usages of Vibrator.vibrate to use
the new overload with an explicit stream hint. This prevents
them from being blocked by rules targeting the unspecified stream.
For calls that pass the existing appops check in VibrateService,
pass streamHint down to the input device vibrator so we don't lose
the signal, but leave it up to InputManager to decide what to do
with it - currently unused.
Change-Id: I65c944e4010edea29a412bf57d8d7d3b8098b746
Jinsuk Kim [Fri, 21 Mar 2014 03:44:11 +0000 (03:44 +0000)]
am
cfba284a: am
d73e66cc: Fix broken build
* commit '
cfba284ad72b6ac3d7189f7c87cddb7299da7617':
Fix broken build
Jinsuk Kim [Fri, 21 Mar 2014 03:40:08 +0000 (03:40 +0000)]
am
d73e66cc: Fix broken build
* commit '
d73e66cce12f13faec44b12d9e6f33c2f28a2d5a':
Fix broken build
Jinsuk Kim [Fri, 21 Mar 2014 02:57:09 +0000 (11:57 +0900)]
Fix broken build
Change-Id: Ia7d207f7937e29cf48dce30d8c5a91f50c9e7d4c
Mike Lockwood [Fri, 21 Mar 2014 03:10:34 +0000 (03:10 +0000)]
am
7a07f4d4: am
a5853b17: am
1fe28b20: am
71060db6: am
dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '
7a07f4d4ad1f2f4893223693aece62f095ce004e':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Mike Lockwood [Fri, 21 Mar 2014 03:10:30 +0000 (03:10 +0000)]
am
e920322f: am
86119603: am
aa7e396f: am
935d417b: am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
e920322ff0c67cdd9e9682fd7c7df5221a6fb13e':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Wei Wang [Fri, 21 Mar 2014 03:10:24 +0000 (03:10 +0000)]
am
3b6689c0: (-s ours) am
e781efd6: am
f479d158: am
bf056846: am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
3b6689c010edd2deaf112f4d4239deeb2a244ea5':
Fix stopBatchedScan not working for wifi
Jinsuk Kim [Fri, 21 Mar 2014 02:41:43 +0000 (02:41 +0000)]
am
f2fecf48: am
c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev
* commit '
f2fecf48f740a079cf9015ea8c2695039ca11d81':
Add HDMI-CEC service
Jinsuk Kim [Fri, 21 Mar 2014 02:37:00 +0000 (02:37 +0000)]
am
c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev
* commit '
c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
Add HDMI-CEC service
Jinsuk Kim [Fri, 21 Mar 2014 02:32:38 +0000 (02:32 +0000)]
Merge "Add HDMI-CEC service" into klp-modular-dev
Mike Lockwood [Fri, 21 Mar 2014 01:25:57 +0000 (01:25 +0000)]
am
a5853b17: am
1fe28b20: am
71060db6: am
dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '
a5853b177c80052246c361e0bc2b0e5809cfeef2':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Mike Lockwood [Fri, 21 Mar 2014 01:25:54 +0000 (01:25 +0000)]
am
86119603: am
aa7e396f: am
935d417b: am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
861196030145ac2a5c9c2abd2c22272cc94fe884':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Mike Lockwood [Fri, 21 Mar 2014 01:20:43 +0000 (01:20 +0000)]
am
1fe28b20: am
71060db6: am
dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '
1fe28b20f1cfc6d2542f8b0bfe48355f3a58067b':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Mike Lockwood [Fri, 21 Mar 2014 01:20:40 +0000 (01:20 +0000)]
am
aa7e396f: am
935d417b: am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
aa7e396f44f9b3b12a6abc9d8d62cf3a6f17527b':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Adam Lesinski [Fri, 21 Mar 2014 01:04:57 +0000 (18:04 -0700)]
Reduce warning verbosity in aapt
- Attributed source of problems to the correct file.
- Only verify string localizations against valid
locales.
Bug:
13140015
Change-Id: I9dabc5efa0510649caee8af0c8ebb803d6f48269
Mike Lockwood [Fri, 21 Mar 2014 01:14:15 +0000 (01:14 +0000)]
am
71060db6: am
dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '
71060db65e0e1c903b429c932cd6e27beec10a3e':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Mike Lockwood [Fri, 21 Mar 2014 01:14:12 +0000 (01:14 +0000)]
am
935d417b: am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
935d417b5615a62bc521a8eb58c35de1b4fdf841':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Winson Chung [Fri, 21 Mar 2014 01:14:07 +0000 (01:14 +0000)]
Merge "Catching case where the activity we are launching from Recents no longer exists."
Winson Chung [Thu, 20 Mar 2014 00:15:29 +0000 (17:15 -0700)]
Catching case where the activity we are launching from Recents no longer exists.
- Also bounding the launch task rect to prevent transitions from far far away when launching a task
Winson Chung [Fri, 21 Mar 2014 01:11:33 +0000 (01:11 +0000)]
Merge "Adding workaround for the status bar not reporting the correct system decor rect."
Mike Lockwood [Fri, 21 Mar 2014 01:09:33 +0000 (01:09 +0000)]
am
dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '
dffdf1079da76f532cd6e72bf537c1a69b099c7e':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Mike Lockwood [Fri, 21 Mar 2014 01:09:31 +0000 (01:09 +0000)]
am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
afc3a5d386459667f87d764038dd30e3490c64c2':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Mike Lockwood [Fri, 21 Mar 2014 01:06:16 +0000 (01:06 +0000)]
Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
Mike Lockwood [Fri, 21 Mar 2014 01:05:56 +0000 (01:05 +0000)]
Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
Winson Chung [Fri, 21 Mar 2014 01:04:46 +0000 (18:04 -0700)]
Adding workaround for the status bar not reporting the correct system decor rect.
Change-Id: I2ea089e9d41deb2ac2a266694ac65d58830856f5
Winson Chung [Fri, 21 Mar 2014 01:02:43 +0000 (01:02 +0000)]
Merge "Adding support for clipping window transition for alternate recents."
Wei Wang [Fri, 21 Mar 2014 00:55:52 +0000 (00:55 +0000)]
am
e781efd6: am
f479d158: am
bf056846: am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
e781efd651cea0fecf3a155a61cca3eed8e9766c':
Fix stopBatchedScan not working for wifi
Wei Wang [Fri, 21 Mar 2014 00:51:14 +0000 (00:51 +0000)]
am
f479d158: am
bf056846: am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
f479d15814f58ed820829fef0bfadf73cb2b88aa':
Fix stopBatchedScan not working for wifi
Wei Wang [Fri, 21 Mar 2014 00:45:42 +0000 (00:45 +0000)]
am
bf056846: am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
bf0568468da9e02c177abaf9116f9995d53b59aa':
Fix stopBatchedScan not working for wifi
Adam Powell [Fri, 21 Mar 2014 00:42:08 +0000 (00:42 +0000)]
am
83b4ce7c: am
d5f3183e: am
1c84e98f: am
a6454ccb: am
49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '
83b4ce7c8b5a3f870e74f46a722ebe7f6ead1cbd':
Update contextual asset bar assets to avoid 9-patch artifacts
Wei Wang [Fri, 21 Mar 2014 00:41:23 +0000 (00:41 +0000)]
am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
058061da46db0fdac8ea53c463a6b615fde3e928':
Fix stopBatchedScan not working for wifi
Winson Chung [Wed, 19 Mar 2014 17:47:20 +0000 (10:47 -0700)]
Adding support for clipping window transition for alternate recents.
Change-Id: Ic7df4e6c0396afc794ffc21694814c0a93f20f31
Adam Powell [Fri, 21 Mar 2014 00:37:55 +0000 (00:37 +0000)]
am
d5f3183e: am
1c84e98f: am
a6454ccb: am
49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '
d5f3183eed14e7e153f185e8303afa1ab2c7415e':
Update contextual asset bar assets to avoid 9-patch artifacts
Wei Wang [Fri, 21 Mar 2014 00:37:33 +0000 (00:37 +0000)]
Merge "Fix stopBatchedScan not working for wifi" into klp-dev
Adam Powell [Fri, 21 Mar 2014 00:33:06 +0000 (00:33 +0000)]
am
1c84e98f: am
a6454ccb: am
49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '
1c84e98fc482f75a7ed4373a22096cd447bc55f9':
Update contextual asset bar assets to avoid 9-patch artifacts
Adam Powell [Fri, 21 Mar 2014 00:26:43 +0000 (00:26 +0000)]
am
a6454ccb: am
49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '
a6454ccbfb5b1f39047f8bac74ec11093469cce2':
Update contextual asset bar assets to avoid 9-patch artifacts
Adam Powell [Fri, 21 Mar 2014 00:22:38 +0000 (00:22 +0000)]
am
49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '
49325305905198b9d077ccc784be96e5684e3623':
Update contextual asset bar assets to avoid 9-patch artifacts
Adam Powell [Fri, 21 Mar 2014 00:19:11 +0000 (00:19 +0000)]
Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
Wei Wang [Thu, 20 Mar 2014 23:27:01 +0000 (16:27 -0700)]
Fix stopBatchedScan not working for wifi
Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
ztenghui [Thu, 20 Mar 2014 22:30:58 +0000 (22:30 +0000)]
Merge "Early rejection on shadows which are outside of the clip bound."
Marco Nelissen [Thu, 20 Mar 2014 22:27:22 +0000 (22:27 +0000)]
am
13a26391: am
113847c3: am
46b26641: am
7d09713c: am
7cd52895: am
5035faba: (-s ours) am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
13a2639165c561c5b83ba4a0d66f9bfa038d3830':
Verify certificates
Vinit Deshapnde [Thu, 20 Mar 2014 22:27:14 +0000 (22:27 +0000)]
am
ffb3e595: (-s ours) am
bb7fdd6e: am
b876cae9: am
f92b0072: am
52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit '
ffb3e595cc4adbe0c31887e42e2200b77d93a024':
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
ztenghui [Wed, 19 Mar 2014 00:25:49 +0000 (17:25 -0700)]
Early rejection on shadows which are outside of the clip bound.
All the computations are estimated using bounding box.
TODO: Spot shadow could have more accurate but also more expensive methods, we need
more experiments to decide.
Change-Id: I9c10c419576cee55daf0f9f278b0db78cb847447
Svetoslav [Thu, 20 Mar 2014 21:56:14 +0000 (21:56 +0000)]
Merge "Fixing yet another build breackage"
Svetoslav [Thu, 20 Mar 2014 21:54:08 +0000 (14:54 -0700)]
Fixing yet another build breackage
Change-Id: I83597d5433fc6cc380d5ec1dd6f78e115e76db5b