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

128411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Svetoslav
a14859a4e9 Merge "Fixing yet another build breackage" 2014-03-20 21:56:14 +00:00
Svetoslav
1a5255d547 Fixing yet another build breackage 
Change-Id: I83597d5433fc6cc380d5ec1dd6f78e115e76db5b
 2014-03-20 14:54:08 -07:00
Baligh Uddin
44d397937f am e003e7e8: (-s ours) am 5c43c357: (-s ours) am c2221b93: (-s ours) am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e003e7e8ca0bd697838ce48700d3fee8faf5110d':
  Import translations. DO NOT MERGE
 2014-03-20 14:11:27 -07:00
Colin Cross
7b266fe851 am 63665f2a: am a3633c25: am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 
* commit '63665f2ac4f25131728a7efff0a449ecdc3f4c50':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
 2014-03-20 14:11:24 -07:00
Adam Koch
887126c378 am 52eb9532: am c5640ea5: am 065b8fd1: am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs 
* commit '52eb953278ad68ba5e5995feb1c8f8d43a7af4c9':
  Point bitmaps training class to new samples directory.
 2014-03-20 14:11:21 -07:00
Scott Main
c3faf9197a am f782b050: am 51daba32: am d4d42af5: am df00735c: am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad 
* commit 'f782b0502a81e5cd95be0e0a3dd4e7a8fa69362c':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
 2014-03-20 14:11:18 -07:00
Wei Wang
cd4d1c805a am 232c6ce3: am 34c40cab: (-s ours) am 331ef612: am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 
* commit '232c6ce37e0645856a943015f607eeb5e3eb06a1':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
 2014-03-20 14:11:15 -07:00
Wei Wang
1e7b30d7f3 am d7e5947c: am 323d8ef3: (-s ours) am 6c9385b1: am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 
* commit 'd7e5947c62e55aef973b5a31354a343fe3ee55b1':
  DO NOT MERGE:  Add status callback for start/stop advertising.
 2014-03-20 14:11:11 -07:00
Jim Miller
da2a02fad7 am e72cb4b0: am 43f8ed56: (-s ours) am 8c5567ee: am bd33dc01: am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService 
* commit 'e72cb4b0ed7ca3a3fd021c53318079b0a4ba61e7':
  DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
 2014-03-20 14:11:08 -07:00
Jim Miller
eff9f7f602 am 12423974: am 3017a015: (-s ours) am e397d90f: am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE 
* commit '12423974d43a2e1792ac45cda2b0bdad8a58c935':
  Fix the build.  DO NOT MERGE
 2014-03-20 14:11:05 -07:00
Michael Wright
8b39449591 am 9abe2088: am 09cb8941: (-s ours) am 11e0ead8: am 69e58e44: Merge "Add idc config option for handling key repeats" into klp-modular-dev 
* commit '9abe2088d1c21719e09b6d80c7a73b7584d7a49d':
  Add idc config option for handling key repeats
 2014-03-20 14:11:02 -07:00
Baligh Uddin
e003e7e8ca am 5c43c357: (-s ours) am c2221b93: (-s ours) am ecf3c574: (-s ours) am 826f3647: (-s ours) am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5c43c35790663442935c901730b5a4403311f254':
  Import translations. DO NOT MERGE
 2014-03-20 21:05:50 +00:00
Colin Cross
63665f2ac4 am a3633c25: am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available" 
* commit 'a3633c25033b576ae160ea86194e4f7f20d82fe2':
  bootanimation: build 32-bit if 64-bit gl libraries are not available
 2014-03-20 21:05:40 +00:00
Adam Koch
52eb953278 am c5640ea5: am 065b8fd1: am 8bc12a51: am 5a510a2c: am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs 
* commit 'c5640ea55aebf86ab652f5a2f8e00e130c479291':
  Point bitmaps training class to new samples directory.
 2014-03-20 21:05:31 +00:00
Scott Main
f782b0502a am 51daba32: am d4d42af5: am df00735c: am e02d5a20: am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad 
* commit '51daba32e0a54391bfae1e60df637068a86f4877':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
 2014-03-20 21:05:26 +00:00
Wei Wang
232c6ce37e am 34c40cab: (-s ours) am 331ef612: am 32779536: am 13bd8577: am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 
* commit '34c40cab3e2bf12db6fbb941573f026376ab71b1':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
 2014-03-20 21:05:23 +00:00
Wei Wang
d7e5947c62 am 323d8ef3: (-s ours) am 6c9385b1: am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev 
* commit '323d8ef30a7dea00f524338f119af4ddbd38db3c':
  DO NOT MERGE:  Add status callback for start/stop advertising.
 2014-03-20 21:05:03 +00:00
Jim Miller
e72cb4b0ed am 43f8ed56: (-s ours) am 8c5567ee: am bd33dc01: am 8e69abf8: am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService 
* commit '43f8ed565a61ecec3b73bb20bd64aac320a47fae':
  DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
 2014-03-20 21:05:00 +00:00
Jim Miller
12423974d4 am 3017a015: (-s ours) am e397d90f: am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGE 
* commit '3017a0157353cd0b34ef67ac15e8086f9f651d12':
  Fix the build.  DO NOT MERGE
 2014-03-20 21:04:57 +00:00
Michael Wright
9abe2088d1 am 09cb8941: (-s ours) am 11e0ead8: am 69e58e44: Merge "Add idc config option for handling key repeats" into klp-modular-dev 
* commit '09cb89414062b5b6b8830307797c83166e1b07d6':
  Add idc config option for handling key repeats
 2014-03-20 21:04:54 +00:00
Marco Nelissen
13a2639165 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 '113847c3f4e6774f991cfa9dcd73e9c53e26bd0e':
  Verify certificates
 2014-03-20 20:57:08 +00:00
Marco Nelissen
113847c3f4 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 '46b2664177521a11ee6f4c05a9aee2b516b8f4c3':
  Verify certificates
 2014-03-20 20:49:54 +00:00
Marco Nelissen
46b2664177 am 7d09713c: am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '7d09713c5198579c0855089a0a77328d4ec1dc36':
  Verify certificates
 2014-03-20 20:45:32 +00:00
Marco Nelissen
7d09713c51 am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '7cd52895ec3e014c1097852725ba68646c1d6665':
  Verify certificates
 2014-03-20 20:41:54 +00:00
Marco Nelissen
7cd52895ec am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
  Verify certificates
 2014-03-20 20:36:34 +00:00
Marco Nelissen
5035faba9a am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit 'cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7':
  Verify certificates
 2014-03-20 13:22:34 -07:00
Marco Nelissen
cecc62086a am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
* commit '759445c5bdb2eb54af9e974f604226596976e078':
  Verify certificates
 2014-03-20 13:16:32 -07:00
Christopher Tate
3defcfc741 am 6b904c8f: Merge "App widget backup/restore infrastructure" 
* commit '6b904c8ffd8c044a9258db495b0cc7e5c5032e59':
  App widget backup/restore infrastructure
 2014-03-20 12:53:28 -07:00
Marco Nelissen
759445c5bd resolved conflicts for merge of c53ad4cd to jb-mr2-dev 
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
 2014-03-20 12:51:55 -07:00
Christopher Tate
6b904c8ffd Merge "App widget backup/restore infrastructure" 2014-03-20 19:51:07 +00:00
Vinit Deshapnde
ffb3e595cc 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 'bb7fdd6e0a421ae31cf46002398a705235bb7916':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
 2014-03-20 19:47:42 +00:00
Vinit Deshapnde
bb7fdd6e0a am b876cae9: am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 
* commit 'b876cae90d8e7e57a685e31cd3b347c325728823':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
 2014-03-20 19:42:08 +00:00
Svetoslav
9d3f49486a am 160c9c8e: Merge "Fixing the build for real." 
* commit '160c9c8ecdbfef56284745448cc2c3816ac5b55c':
  Fixing the build for real.
 2014-03-20 12:38:28 -07:00
Vinit Deshapnde
b876cae90d am f92b0072: am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev 
* commit 'f92b00722d84fa0caea25a3363242b6dced0635c':
  DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
 2014-03-20 19:36:59 +00:00
Mike Lockwood
d8be49089f UsbDeviceManager: A better fix for race condition when starting USB accessory mode 
On some devices, the USB "set configuration" command is propogated to the framework
after the "start accessory" event is received.  However, on other devices like
the 2011 ADK board, no "set configuration" command is sent at all until we have
reenumerated in acccessory mode.  To fix the original problem without breaking other
devices, we can simply remove assumptions about if or when "set configuration"
will be received.  Now we simply remain switch USB configuration to accessory mode
when we receive the "start accessory" command, and remain there until the existing
10 second timeout expires.

Bug: 13393825

Change-Id: I4c9e3423185bd7252a907e4568d9e3ff06044b7d
 2014-03-20 12:36:51 -07:00
Mike Lockwood
205a3ea0e2 Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" 
This reverts commit fbd5521fb5e94fad066e21b9f91f4782afe71660.

This change broke support for the 2011 ADK board, which never sends a "set configuration"
command before "accessory start".  So we revert this change and will replace it with a better fix.

Bug: 13535051
Bug: 13393825

Change-Id: Icd870d7ff6daff1567e04d93907f70f5d7e37884
 2014-03-20 12:36:34 -07:00
Svetoslav
160c9c8ecd Merge "Fixing the build for real." 2014-03-20 19:32:56 +00:00