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

97776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
4725b58e54 am 15434e7c: am a828b8ff: am 3b16e13c: am 3a494adf: Merge "docs: add cursorloader class to side nav" into jb-mr1-dev 
* commit '15434e7cccee95b2d63e61a2cd12a5e32dc757d7':
  docs: add cursorloader class to side nav
 2012-12-14 16:48:29 -08:00
Baligh Uddin
65fe00812e am 4e7ec514: (-s ours) am 0ec825ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '4e7ec51472c531d582322bfde59073ab38336b41':
  Import translations. DO NOT MERGE
 2012-12-14 16:48:25 -08:00
Quddus Chong
6d430fd9ef am 13bc2d26: am cac633c7: am dc167dc6: am 9b7cb6f0: docs: Fixing broken IABv3 internal links 
* commit '13bc2d264c7f111d0515e4abf158f4fd6b31a646':
  docs: Fixing broken IABv3 internal links
 2012-12-14 16:48:21 -08:00
Irfan Sheriff
224333c03f Merge "P2p cleanup" 2012-12-14 16:07:46 -08:00
Irfan Sheriff
f118043ca7 P2p cleanup 
- Clean up handling of mSavedPeerConfig
- Add argument protection
- Split out WPS handling on GO into a separate API. This was almost hacky
right now for applications and was working in an undocumented way
- Refactor connect function call and fix updating group capability

Change-Id: I26211c72ad60c6b6c939ad7473fcf2fc633f3010
 2012-12-14 14:48:10 -08:00
Adam Cohen
f85f1aeb56 Merge "Fix docs build issue" 2012-12-14 12:11:38 -08:00
Baligh Uddin
d663b8cffd Merge "Import translations. DO NOT MERGE" 2012-12-14 12:05:28 -08:00
Adam Cohen
3b4ca103f8 Fix docs build issue 
Change-Id: I901e5b80609bf5ae85b167ec01b7507714423e5c
 2012-12-14 12:00:56 -08:00
Scott Main
15434e7ccc am a828b8ff: am 3b16e13c: am 3a494adf: Merge "docs: add cursorloader class to side nav" into jb-mr1-dev 
* commit 'a828b8ffc33ecdeaf71d119abf5e50df3b781387':
  docs: add cursorloader class to side nav
 2012-12-14 11:59:15 -08:00
Scott Main
a828b8ffc3 am 3b16e13c: am 3a494adf: Merge "docs: add cursorloader class to side nav" into jb-mr1-dev 
* commit '3b16e13c48473f4f357a9b8fea38b7f822343274':
  docs: add cursorloader class to side nav
 2012-12-14 11:57:15 -08:00
Baligh Uddin
4e7ec51472 am 0ec825ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '0ec825ed70dd8383b0248608aa7abe0e8ed81854':
  Import translations. DO NOT MERGE
 2012-12-14 11:55:37 -08:00
Scott Main
3b16e13c48 am 3a494adf: Merge "docs: add cursorloader class to side nav" into jb-mr1-dev 
* commit '3a494adf97c4a096238a75a8f39fbeddc2cddadb':
  docs: add cursorloader class to side nav
 2012-12-14 11:55:00 -08:00
Quddus Chong
13bc2d264c am cac633c7: am dc167dc6: am 9b7cb6f0: docs: Fixing broken IABv3 internal links 
* commit 'cac633c7316b6dd569864ee70e45fcbb36653066':
  docs: Fixing broken IABv3 internal links
 2012-12-14 11:54:03 -08:00
Baligh Uddin
0ec825ed70 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-12-14 11:52:52 -08:00
Scott Main
3a494adf97 Merge "docs: add cursorloader class to side nav" into jb-mr1-dev 2012-12-14 11:51:51 -08:00
Quddus Chong
cac633c731 am dc167dc6: am 9b7cb6f0: docs: Fixing broken IABv3 internal links 
* commit 'dc167dc6c756697aba317d41b4f53504be7eae83':
  docs: Fixing broken IABv3 internal links
 2012-12-14 11:51:27 -08:00
Quddus Chong
dc167dc6c7 am 9b7cb6f0: docs: Fixing broken IABv3 internal links 
* commit '9b7cb6f03b2b5492b26fdffd0dddcadb74e8e239':
  docs: Fixing broken IABv3 internal links
 2012-12-14 11:48:13 -08:00
Stephen Hines
75166902c6 Merge "Revert "Turn off IP2."" 2012-12-14 11:41:17 -08:00
Stephen Hines
2e28e2b324 Revert "Turn off IP2." 
This reverts commit bc897302afcc40aee2bbce75a156a0d61883ff55

Change-Id: Ie2d0f32e248a20c26e8251195614d8df751c99ae
 2012-12-14 11:39:47 -08:00
Scott Main
8ac78803f5 docs: add cursorloader class to side nav 
Change-Id: I1be67b98f71b9e3759b06b851c30b49f8ccdef64
 2012-12-14 11:39:03 -08:00
Baligh Uddin
62541594c1 Import translations. DO NOT MERGE 
Change-Id: I2ed4225f2b9fc3cb25a8d2efed93d1e7883cdcac
Auto-generated-cl: translation import
 2012-12-14 11:33:05 -08:00
Baligh Uddin
5d3316d603 Import translations. DO NOT MERGE 
Change-Id: Idc82d91525857387cf867e8ac14859900fb5f1a3
Auto-generated-cl: translation import
 2012-12-14 11:23:14 -08:00
Quddus Chong
9b7cb6f03b docs: Fixing broken IABv3 internal links 
Change-Id: Ia0c087645e72a879c9883b9d62bf997afb407ce4
 2012-12-14 11:22:29 -08:00
Mike Cleron
40efbd4060 am 323bb07f: am a5a4eb0f: am 6b922cc6: Merge "Receive a user dictionary callback from Settings application" into jb-mr1.1-dev 
* commit '323bb07f762e5373f90e758a1146b93a3c31fe17':
  Receive a user dictionary callback from Settings application
 2012-12-14 11:04:42 -08:00
Mike Cleron
323bb07f76 am a5a4eb0f: am 6b922cc6: Merge "Receive a user dictionary callback from Settings application" into jb-mr1.1-dev 
* commit 'a5a4eb0f93d4b992a1879e26e04ba803827e24ca':
  Receive a user dictionary callback from Settings application
 2012-12-14 11:01:55 -08:00
Mike Cleron
a5a4eb0f93 am 6b922cc6: Merge "Receive a user dictionary callback from Settings application" into jb-mr1.1-dev 
* commit '6b922cc6d4d8221ad83b410c03eb4b8fb9fc78e2':
  Receive a user dictionary callback from Settings application
 2012-12-14 10:59:19 -08:00
Mike Cleron
6b922cc6d4 Merge "Receive a user dictionary callback from Settings application" into jb-mr1.1-dev 2012-12-14 10:57:45 -08:00
John Spurlock
90558bd6f1 am 5eb91627: am 7739a5ca: am f5df689a: Fix NPE inside DreamManagerService. 
* commit '5eb9162761a5f48b47545bf9e73a34f570deedec':
  Fix NPE inside DreamManagerService.
 2012-12-14 10:34:10 -08:00
Joe Malin
f0369feb2d am bd9d92b6: am 5e1f7f08: am 2fc4182b: am 3252eb96: am cad9660f: am 7eef172e: am ba34f097: Android Training: Loading Data in the Background 
* commit 'bd9d92b62cfe197a15a29f8760a6c19c499e80dc':
  Android Training: Loading Data in the Background
 2012-12-14 10:31:23 -08:00
John Spurlock
5eb9162761 am 7739a5ca: am f5df689a: Fix NPE inside DreamManagerService. 
* commit '7739a5ca673ba2264295641466569b2a1c788fe9':
  Fix NPE inside DreamManagerService.
 2012-12-14 10:31:16 -08:00
John Spurlock
7739a5ca67 am f5df689a: Fix NPE inside DreamManagerService. 
* commit 'f5df689aa65682ce9217405e4a6b686e94129e8f':
  Fix NPE inside DreamManagerService.
 2012-12-14 10:29:32 -08:00
Joe Malin
bd9d92b62c am 5e1f7f08: am 2fc4182b: am 3252eb96: am cad9660f: am 7eef172e: am ba34f097: Android Training: Loading Data in the Background 
* commit '5e1f7f08c8d9111f285cbb54e3408fc01825d24d':
  Android Training: Loading Data in the Background
 2012-12-14 10:29:32 -08:00
Joe Malin
5e1f7f08c8 am 2fc4182b: am 3252eb96: am cad9660f: am 7eef172e: am ba34f097: Android Training: Loading Data in the Background 
* commit '2fc4182b854036593d71e78c6b8de43dac86c967':
  Android Training: Loading Data in the Background
 2012-12-14 10:27:40 -08:00
John Spurlock
f5df689aa6 Fix NPE inside DreamManagerService. 
Bug:7741911
Change-Id: Icfc39b2d89f57bba79866030df85b822e3f73ae2
 2012-12-14 13:12:43 -05:00
Satoshi Kataoka
0e3849af47 Receive a user dictionary callback from Settings application 
Bug: 7725834

The callback is sent when the user adds a word to the user dictionary.

Change-Id: Ieee9bfd50a9adbed1a769e3cd95d9cb2815c34b4
 2012-12-14 17:21:43 +09:00
Andrew Hsieh
3604e037f4 Merge "Fix typo" 2012-12-13 19:38:25 -08:00
Joe Malin
2fc4182b85 am 3252eb96: am cad9660f: am 7eef172e: am ba34f097: Android Training: Loading Data in the Background 
* commit '3252eb96577d9e7080542804129cbdb197c768a9':
  Android Training: Loading Data in the Background
 2012-12-13 18:13:05 -08:00
Joe Malin
3252eb9657 am cad9660f: am 7eef172e: am ba34f097: Android Training: Loading Data in the Background 
* commit 'cad9660fe739df5ec6b919f8f5e94a222a3a83e9':
  Android Training: Loading Data in the Background
 2012-12-13 18:08:02 -08:00
Joe Malin
cad9660fe7 am 7eef172e: am ba34f097: Android Training: Loading Data in the Background 
* commit '7eef172e9b1c4ffc97cb7b9ea4216c718a832926':
  Android Training: Loading Data in the Background
 2012-12-13 18:03:38 -08:00
Joe Malin
4f7bf6ea07 am 0b7d87cb: am 803abe6e: am 35ef45a7: am 28cb6150: am 7096a17e: am 718c7484: am f0f5efbe: Android Training: Run in a Background Service 
* commit '0b7d87cb668732a9ff06605dd42cc01895900dac':
  Android Training: Run in a Background Service
 2012-12-13 18:00:19 -08:00
Joe Malin
7eef172e9b am ba34f097: Android Training: Loading Data in the Background 
* commit 'ba34f097df278ce1861ebfecdaf634f519ba1f36':
  Android Training: Loading Data in the Background
 2012-12-13 17:58:19 -08:00
Adam Cohen
3366cb2a01 Merge "Adding simple ArrayList API for collection widgets" 2012-12-13 17:50:11 -08:00
Joe Malin
ba34f097df Android Training: Loading Data in the Background 
Change-Id: Ibb469cd068068b37ea95371afb7e4dca4535ba94
 2012-12-13 17:07:53 -08:00
Joe Malin
0b7d87cb66 am 803abe6e: am 35ef45a7: am 28cb6150: am 7096a17e: am 718c7484: am f0f5efbe: Android Training: Run in a Background Service 
* commit '803abe6e4b251e29bf7fe3c015cfb7e110d495ba':
  Android Training: Run in a Background Service
 2012-12-13 16:24:25 -08:00
Joe Malin
803abe6e4b am 35ef45a7: am 28cb6150: am 7096a17e: am 718c7484: am f0f5efbe: Android Training: Run in a Background Service 
* commit '35ef45a7a05840a42b83698564aa098ccc07644e':
  Android Training: Run in a Background Service
 2012-12-13 16:22:43 -08:00
Joe Malin
35ef45a7a0 am 28cb6150: am 7096a17e: am 718c7484: am f0f5efbe: Android Training: Run in a Background Service 
* commit '28cb615003b1f96f7e9e579a7859094f4598e580':
  Android Training: Run in a Background Service
 2012-12-13 16:20:25 -08:00
Joe Malin
28cb615003 am 7096a17e: am 718c7484: am f0f5efbe: Android Training: Run in a Background Service 
* commit '7096a17e953d7e126e6ac8952b38920e0ea7e7e1':
  Android Training: Run in a Background Service
 2012-12-13 16:18:19 -08:00
Joe Malin
7096a17e95 am 718c7484: am f0f5efbe: Android Training: Run in a Background Service 
* commit '718c7484cf008d45f8501ae7d0cd57b31f935934':
  Android Training: Run in a Background Service
 2012-12-13 16:16:54 -08:00
Joe Malin
718c7484cf am f0f5efbe: Android Training: Run in a Background Service 
* commit 'f0f5efbea206fd0fbac655519f3f535620ed74cc':
  Android Training: Run in a Background Service
 2012-12-13 16:15:36 -08:00
Jeff Sharkey
6fd651ebf2 Merge "Move DRM to CloseGuard, add DrmOutputStream." 2012-12-13 15:39:10 -08:00