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

111459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
ba9708e326 am ee9d4438: Merge "Use explicit intent for MediaScannerConnection" into klp-dev 
* commit 'ee9d44384239fff3d61cd4dd27f9daefb8a7103a':
  Use explicit intent for MediaScannerConnection
 2013-08-28 10:21:55 -07:00
Marco Nelissen
ee9d443842 Merge "Use explicit intent for MediaScannerConnection" into klp-dev 2013-08-28 17:19:47 +00:00
Jason Monk
59d234e71c am 1f809c77: Merge "Don\'t clear Global Proxy on boot." into klp-dev 
* commit '1f809c7761a52102621b22fe8ec8c9f91ec1fe54':
  Don't clear Global Proxy on boot.
 2013-08-28 07:43:39 -07:00
Jason Monk
1f809c7761 Merge "Don't clear Global Proxy on boot." into klp-dev 2013-08-28 14:41:15 +00:00
John Spurlock
03049719de am d20aeab0: Merge "SystemUI asset update post ux asset merge." into klp-dev 
* commit 'd20aeab028bae53b46a707119e57a50c073337c2':
  SystemUI asset update post ux asset merge.
 2013-08-28 06:28:23 -07:00
John Spurlock
d20aeab028 Merge "SystemUI asset update post ux asset merge." into klp-dev 2013-08-28 13:26:01 +00:00
Daniel Sandler
7c4ae8b3d9 am f31da76a: Merge "Remove period from "No service."" into klp-dev 
* commit 'f31da76a3a36c75eafa7078a90d982c0e6916b41':
  Remove period from "No service."
 2013-08-28 06:03:17 -07:00
John Spurlock
0d1376811c SystemUI asset update post ux asset merge. 
Bug:10502089
Change-Id: I88b0b4a17018766bccb99426f8f270214c883427
 2013-08-28 09:02:40 -04:00
Daniel Sandler
f31da76a3a Merge "Remove period from "No service."" into klp-dev 2013-08-28 13:01:21 +00:00
Daniel Sandler
52a1923592 Remove period from "No service." 
Bug: 10460869
Change-Id: I57b030518c9cfec367da21e39af7a001a565daa4
 2013-08-28 08:42:14 -04:00
Zhijun He
525319cd22 am 5b6ce5a2: Merge "ImageReader: Fix null listener case" into klp-dev 
* commit '5b6ce5a2921caa63481630f877356e5678ee9ffa':
  ImageReader: Fix null listener case
 2013-08-27 19:24:59 -07:00
Zhijun He
5b6ce5a292 Merge "ImageReader: Fix null listener case" into klp-dev 2013-08-28 02:22:37 +00:00
John Spurlock
fee8a47165 am ae73139f: Merge "Remove unreferenced assets from SystemUI." into klp-dev 
* commit 'ae73139f37a34cb4cc51255cc15cd19fbc11416a':
  Remove unreferenced assets from SystemUI.
 2013-08-27 18:31:34 -07:00
John Spurlock
ae73139f37 Merge "Remove unreferenced assets from SystemUI." into klp-dev 2013-08-28 01:26:13 +00:00
Jeff Hao
896e5d7587 am 09944b04: am 6b34ab3f: Merge "Merge MPSE and SPSE Chunk handlers for ddms." 
* commit '09944b04fa29eca7f889413988a05a268a5521f5':
  Merge MPSE and SPSE Chunk handlers for ddms.
 2013-08-27 18:21:27 -07:00
Jeff Hao
f46f843171 am 5d21168b: am 366291e2: Merge "Add frameworks support for sample profiling from traceview gui." 
* commit '5d21168bb4b33fb5eb8770996895a729880c7dbc':
  Add frameworks support for sample profiling from traceview gui.
 2013-08-27 18:21:23 -07:00
Jeff Hao
09944b04fa am 6b34ab3f: Merge "Merge MPSE and SPSE Chunk handlers for ddms." 
* commit '6b34ab3f1aafc3143c71e342b7a9f5a6ddfeabb4':
  Merge MPSE and SPSE Chunk handlers for ddms.
 2013-08-27 18:18:47 -07:00
Jeff Hao
5d21168bb4 am 366291e2: Merge "Add frameworks support for sample profiling from traceview gui." 
* commit '366291e2830b96268458dd6c5b15412e46d93145':
  Add frameworks support for sample profiling from traceview gui.
 2013-08-27 18:18:43 -07:00
Jeff Hao
6b34ab3f1a Merge "Merge MPSE and SPSE Chunk handlers for ddms." 2013-08-28 01:14:26 +00:00
Jeff Hao
366291e283 Merge "Add frameworks support for sample profiling from traceview gui." 2013-08-28 01:14:20 +00:00
Jeff Hao
6c7bac69f5 Merge MPSE and SPSE Chunk handlers for ddms. 
(cherry picked from commit fd224b97797dfb7e3ee1e2f56c3109d1594cf040)

Change-Id: I1dab7801d47f092259916c4aea19b20d17951c2f
 2013-08-27 17:59:32 -07:00
Baligh Uddin
22636af2ee am ef800067: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ef8000670e0a61085572eeb8ee9115cecebb73a7':
  Import translations. DO NOT MERGE
 2013-08-27 17:49:14 -07:00
Jeff Hao
ffee626c3a Add frameworks support for sample profiling from traceview gui. 
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)

Change-Id: Ic193ddadf01c42905fc7c35a1a8bf89fba4556e9
 2013-08-27 17:46:18 -07:00
Baligh Uddin
ef8000670e Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-28 00:45:47 +00:00
Baligh Uddin
23ca56fc8d am c513608d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c513608dc1944ec8c6578110e47dc60fc9fda4e1':
  Import translations. DO NOT MERGE
 2013-08-27 17:45:45 -07:00
Baligh Uddin
d0ed585368 am 397c7aaf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '397c7aaf8d9a888727f3d1f54282420ee4f830d3':
  Import translations. DO NOT MERGE
 2013-08-27 17:45:42 -07:00
Baligh Uddin
c513608dc1 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-28 00:42:58 +00:00
Baligh Uddin
397c7aaf8d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-28 00:42:36 +00:00
Svetoslav Ganov
39149ff6be am ca09dbc6: Merge "Print APIs update." into klp-dev 
* commit 'ca09dbc67b28d5d1d16b7966b855229697c6c549':
  Print APIs update.
 2013-08-27 17:10:10 -07:00
Svetoslav Ganov
ca09dbc67b Merge "Print APIs update." into klp-dev 2013-08-28 00:07:09 +00:00
Martijn Coenen
61fdf6d155 am bbbc8660: Merge "Add NFC reader-mode API." into klp-dev 
* commit 'bbbc8660cdbfb033291f1911742a942a42c85af0':
  Add NFC reader-mode API.
 2013-08-27 16:11:32 -07:00
Martijn Coenen
bbbc8660cd Merge "Add NFC reader-mode API." into klp-dev 2013-08-27 23:08:56 +00:00
Zhijun He
e2a11bb74d ImageReader: Fix null listener case 
Only do the handler check when listener is not null.

Bug: 10360518
Change-Id: I9940942ae95a492c92e028e5f862beea16e1da80
 2013-08-27 16:02:21 -07:00
Alan Viverette
5c5fbb39ec am 3d1b3cb9: Merge "Add documentation to onTouchEvent for accessibility" into klp-dev 
* commit '3d1b3cb9d9ea206d4244ed369224faf4d859973e':
  Add documentation to onTouchEvent for accessibility
 2013-08-27 15:52:50 -07:00
Sreeram Ramachandran
3175f08ecb am d8d4c51e: Merge "Fix channel set option in wifi batch scan command." into klp-dev 
* commit 'd8d4c51e3b966b9eaff391f736c716343984e79b':
  Fix channel set option in wifi batch scan command.
 2013-08-27 15:49:25 -07:00
Alan Viverette
3d1b3cb9d9 Merge "Add documentation to onTouchEvent for accessibility" into klp-dev 2013-08-27 22:48:03 +00:00
Sreeram Ramachandran
d8d4c51e3b Merge "Fix channel set option in wifi batch scan command." into klp-dev 2013-08-27 22:45:30 +00:00
John Spurlock
4bf5c0e242 Remove unreferenced assets from SystemUI. 
Bug:10502089
Change-Id: I9c414ff88054a764ab56f70ae8a0c0c82c248be9
 2013-08-27 17:53:08 -04:00
Sreeram Ramachandran
268f329521 Fix channel set option in wifi batch scan command. 
Fix by not including extraneous delimiters, and changing the delimiter from a
space to a comma.

Bug: 10444428
Change-Id: Ia3197045d44a2f959316935ae085575500e65459
 2013-08-27 14:49:23 -07:00
Martijn Coenen
c20ed2ff12 Add NFC reader-mode API. 
Allows applications to temporarily force the NFC controller
to only do tag discovery. This will allow Android applications
to read and interact with devices that employ HCE.

Bug: 10360259
Change-Id: I709ead9a26f8e6ae8582cc295d82bd896e7c5bba
 2013-08-27 14:32:53 -07:00
Craig Mautner
8a778be5dc am 61f0f9ad: Merge "When adding a window evaluate all tasks." into klp-dev 
* commit '61f0f9ada51a6718075acfe7fafbb9954f38e980':
  When adding a window evaluate all tasks.
 2013-08-27 14:23:07 -07:00
Craig Mautner
8fce994c84 am ac738a25: Merge "Hide stackId from prying eyes." into klp-dev 
* commit 'ac738a25f8d0a9fcd5e30ad1a7b98683726c49f3':
  Hide stackId from prying eyes.
 2013-08-27 14:23:04 -07:00
Craig Mautner
61f0f9ada5 Merge "When adding a window evaluate all tasks." into klp-dev 2013-08-27 21:20:52 +00:00
Craig Mautner
ac738a25f8 Merge "Hide stackId from prying eyes." into klp-dev 2013-08-27 21:20:30 +00:00
Christopher Tate
4b739259d2 am d381680b: Merge "Make sure to actually log when Log.wtf() hiccups" into klp-dev 
* commit 'd381680b63a36f8a4f1b07286947f1227d83139d':
  Make sure to actually log when Log.wtf() hiccups
 2013-08-27 14:19:29 -07:00
Christopher Tate
d381680b63 Merge "Make sure to actually log when Log.wtf() hiccups" into klp-dev 2013-08-27 21:15:03 +00:00
Christopher Tate
941adc95e1 Make sure to actually log when Log.wtf() hiccups 
Bug 10494724

Change-Id: I687d7df73a8f4594d42955f100d928e98bbd9b30
 2013-08-27 14:10:44 -07:00
Sandeep Siddhartha
b926523388 am 572ec4e8: Merge "Temporary disable Hotword on lockscreen" into klp-dev 
* commit '572ec4e88c943e0ec717b773406aca43a5eafcb9':
  Temporary disable Hotword on lockscreen
 2013-08-27 13:36:05 -07:00
Sandeep Siddhartha
572ec4e88c Merge "Temporary disable Hotword on lockscreen" into klp-dev 2013-08-27 20:31:32 +00:00
Sandeep Siddhartha
c4c330156e Temporary disable Hotword on lockscreen 
Change-Id: Icdddcc0308b9f3153172e34a8f4d051c58829653
 2013-08-27 13:25:40 -07:00