drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,502 Commits 1 Branch 0 Tags
Commit Graph

128502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
8a2c075eac am c84b4d7f: 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 'c84b4d7ff20c21aa3658c81c18546a74921be441':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
 2014-03-20 20:14:12 -07:00
Wei Wang
4059a0d8a2 am 6890727c: am 3b6689c0: (-s ours) am e781efd6: am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit '6890727c0dca223254a5b1edf18b11061fde67fa':
  Fix stopBatchedScan not working for wifi
 2014-03-20 20:14:09 -07:00
Mike Lockwood
0416faa2b2 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
 2014-03-21 03:10:34 +00:00
Mike Lockwood
c84b4d7ff2 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"
 2014-03-21 03:10:30 +00:00
Wei Wang
6890727c0d 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
 2014-03-21 03:10:24 +00:00
Jinsuk Kim
a67e34c80f am f2fecf48: am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev 
* commit 'f2fecf48f740a079cf9015ea8c2695039ca11d81':
  Add HDMI-CEC service
 2014-03-21 02:41:43 +00:00
Jinsuk Kim
f2fecf48f7 am c61f4dd7: Merge "Add HDMI-CEC service" into klp-modular-dev 
* commit 'c61f4dd744b1b0396703aa58eb22fc31d2b7050e':
  Add HDMI-CEC service
 2014-03-21 02:37:00 +00:00
Jinsuk Kim
c61f4dd744 Merge "Add HDMI-CEC service" into klp-modular-dev 2014-03-21 02:32:38 +00:00
Mike Lockwood
7a07f4d4ad 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
 2014-03-21 01:25:57 +00:00
Mike Lockwood
e920322ff0 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"
 2014-03-21 01:25:54 +00:00
Mike Lockwood
a5853b177c 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
 2014-03-21 01:20:43 +00:00
Mike Lockwood
8611960301 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"
 2014-03-21 01:20:40 +00:00
Winson Chung
0f87a1ad49 am dd1b1451: Merge "Catching case where the activity we are launching from Recents no longer exists." 
* commit 'dd1b145158a8c3ea269347c614814631297e7acd':
  Catching case where the activity we are launching from Recents no longer exists.
 2014-03-20 18:16:45 -07:00
Winson Chung
e5ff264da6 am 0bfae106: Merge "Adding workaround for the status bar not reporting the correct system decor rect." 
* commit '0bfae1063a9db09338dd87c3656445b439da5898':
  Adding workaround for the status bar not reporting the correct system decor rect.
 2014-03-20 18:16:42 -07:00
Adam Lesinski
a01a9374fd 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
 2014-03-20 18:14:48 -07:00
Mike Lockwood
1fe28b20f1 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
 2014-03-21 01:14:15 +00:00
Mike Lockwood
aa7e396f44 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"
 2014-03-21 01:14:12 +00:00
Winson Chung
dd1b145158 Merge "Catching case where the activity we are launching from Recents no longer exists." 2014-03-21 01:14:07 +00:00
Winson Chung
c620bafde8 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
 2014-03-20 18:12:37 -07:00
Winson Chung
0bfae1063a Merge "Adding workaround for the status bar not reporting the correct system decor rect." 2014-03-21 01:11:33 +00:00
Mike Lockwood
71060db65e 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
 2014-03-21 01:09:33 +00:00
Mike Lockwood
935d417b56 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"
 2014-03-21 01:09:31 +00:00
Winson Chung
5a7e7fdf94 am 7bcdb33d: Merge "Adding support for clipping window transition for alternate recents." 
* commit '7bcdb33d859ffb70f235cc8e0f22a0598194ddf8':
  Adding support for clipping window transition for alternate recents.
 2014-03-20 18:06:37 -07:00
Mike Lockwood
dffdf1079d Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev 2014-03-21 01:06:16 +00:00
Mike Lockwood
afc3a5d386 Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev 2014-03-21 01:05:57 +00:00
Winson Chung
96d970c93e Adding workaround for the status bar not reporting the correct system decor rect. 
Change-Id: I2ea089e9d41deb2ac2a266694ac65d58830856f5
 2014-03-20 18:04:46 -07:00
Winson Chung
7bcdb33d85 Merge "Adding support for clipping window transition for alternate recents." 2014-03-21 01:02:44 +00:00
Wei Wang
3b6689c010 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
 2014-03-21 00:55:52 +00:00
Wei Wang
e781efd651 am f479d158: am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit 'f479d15814f58ed820829fef0bfadf73cb2b88aa':
  Fix stopBatchedScan not working for wifi
 2014-03-21 00:51:14 +00:00
Adam Powell
113321307b am 9eaf8864: 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 '9eaf8864c7649a0705d5f85b5fd9832a53383519':
  Update contextual asset bar assets to avoid 9-patch artifacts
 2014-03-20 17:46:03 -07:00
Wei Wang
f479d15814 am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit 'bf0568468da9e02c177abaf9116f9995d53b59aa':
  Fix stopBatchedScan not working for wifi
 2014-03-21 00:45:42 +00:00
Adam Powell
9eaf8864c7 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
 2014-03-21 00:42:08 +00:00
Wei Wang
bf0568468d am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev 
* commit '058061da46db0fdac8ea53c463a6b615fde3e928':
  Fix stopBatchedScan not working for wifi
 2014-03-21 00:41:23 +00:00
Winson Chung
399f62052a Adding support for clipping window transition for alternate recents. 
Change-Id: Ic7df4e6c0396afc794ffc21694814c0a93f20f31
 2014-03-20 17:39:19 -07:00
Adam Powell
83b4ce7c8b 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
 2014-03-21 00:37:55 +00:00
Wei Wang
058061da46 Merge "Fix stopBatchedScan not working for wifi" into klp-dev 2014-03-21 00:37:34 +00:00
Adam Powell
d5f3183eed 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
 2014-03-21 00:33:06 +00:00
Adam Powell
1c84e98fc4 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
 2014-03-21 00:26:43 +00:00
Adam Powell
a6454ccbfb 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
 2014-03-21 00:22:38 +00:00
Adam Powell
4932530590 Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev 2014-03-21 00:19:12 +00:00
Wei Wang
d181673e28 Fix stopBatchedScan not working for wifi 
Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
 2014-03-20 17:05:42 -07:00
Will Haldean Brown
06c23150bf Make windowSwipeToDismiss a public attribute. 
Bug: 13348970
Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c
 2014-03-20 16:31:48 -07:00
ztenghui
9011790bec am 32ff540c: Merge "Early rejection on shadows which are outside of the clip bound." 
* commit '32ff540c74623d92a8bf1e0a0ae3153a7a6d13e4':
  Early rejection on shadows which are outside of the clip bound.
 2014-03-20 15:34:56 -07:00
Marco Nelissen
6d384d13ed am 63f4e55b: 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 '63f4e55ba5df622a47ea9d60ef0626995f3d677a':
  Verify certificates
 2014-03-20 15:31:29 -07:00
Vinit Deshapnde
76b596f670 am 81505a5f: 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 '81505a5f56e0b39d084aa54588ed17ce7fd9e8a1':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
 2014-03-20 15:31:26 -07:00
ztenghui
32ff540c74 Merge "Early rejection on shadows which are outside of the clip bound." 2014-03-20 22:30:59 +00:00
Marco Nelissen
63f4e55ba5 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
 2014-03-20 22:27:22 +00:00
Vinit Deshapnde
81505a5f56 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
 2014-03-20 22:27:14 +00:00
ztenghui
af6f7ed8dd 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
 2014-03-20 15:25:47 -07:00
Svetoslav
bb35287059 am a14859a4: Merge "Fixing yet another build breackage" 
* commit 'a14859a4e929ce585e38509d5fab784e8392b796':
  Fixing yet another build breackage
 2014-03-20 15:13:01 -07:00