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

97757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
d663b8cffd Merge "Import translations. DO NOT MERGE" 2012-12-14 12:05:28 -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
Baligh Uddin
62541594c1 Import translations. DO NOT MERGE 
Change-Id: I2ed4225f2b9fc3cb25a8d2efed93d1e7883cdcac
Auto-generated-cl: translation import
 2012-12-14 11:33:05 -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
Adam Cohen
50f3d1bae8 Adding simple ArrayList API for collection widgets 
Change-Id: I4d6c909d1d2c0bdd1ddc8329445cea0e78a5ce7c
 2012-12-13 14:52:30 -08:00
Joe Malin
f0f5efbea2 Android Training: Run in a Background Service 
Change-Id: I002af57c65eccd0a624e00ef4b1607469199ce6b
 2012-12-13 14:32:19 -08:00
Stephen Hines
bd008614aa Merge "Turn off IP2." 2012-12-13 14:28:29 -08:00
Stephen Hines
bc897302af Turn off IP2. 
Change-Id: I1d45b0077c1a57c74e36fa8df45428b06a454253
 2012-12-13 14:26:12 -08:00
Jeff Sharkey
f67c8a9685 Move DRM to CloseGuard, add DrmOutputStream. 
Switch DrmManagerClient to using CloseGuard to better track leaked
resources.  Add DrmOutputStream which applies DRM transformation as
data is written, similar to FilterOutputStream.  Also writes DRM
headers before closing.

Change-Id: Ic106a3e6f6ff666e4dda484fbd234a0849eec8c0
 2012-12-13 13:51:40 -08:00
Fabrice Di Meglio
7345f24ff8 am 5780e196: am 5c0d6f99: am 9de88dad: Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev 
* commit '5780e196806b3741786b212866435593990f97ee':
  Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
 2012-12-13 12:35:14 -08:00
Fabrice Di Meglio
5780e19680 am 5c0d6f99: am 9de88dad: Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev 
* commit '5c0d6f9980ed4684cbeefc28036dd9eeac474375':
  Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
 2012-12-13 12:33:35 -08:00
Fabrice Di Meglio
5c0d6f9980 am 9de88dad: Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev 
* commit '9de88dad29d89ec81c5e6b0df5aa92a04c8ce781':
  Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
 2012-12-13 12:31:17 -08:00
Fabrice Di Meglio
9de88dad29 Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev 2012-12-13 12:28:24 -08:00
Joe Fernandez
33b7978cf4 am 3042da88: am b2aa3a74: am 54091f87: am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit '3042da88095760005a4a2424f188cb0392ab064a':
  docs: NDK r8d Release Notes
 2012-12-13 12:23:50 -08:00
Joe Fernandez
3042da8809 am b2aa3a74: am 54091f87: am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit 'b2aa3a74754299488acdff3843763f46ca571d2e':
  docs: NDK r8d Release Notes
 2012-12-13 12:20:09 -08:00
Joe Fernandez
2398d4d982 am 1f69c3b2: am 86841bd5: am 700f9ea3: am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '1f69c3b27658d00b6b581e8ecdd14910fbc25053':
  docs: SDK r21.0.1 Release Notes
 2012-12-13 12:19:36 -08:00
Joe Fernandez
b2aa3a7475 am 54091f87: am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit '54091f8730850772606ab2d4b4591bb902c52b44':
  docs: NDK r8d Release Notes
 2012-12-13 12:18:00 -08:00
Joe Fernandez
1f69c3b276 am 86841bd5: am 700f9ea3: am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '86841bd5c1d537da40e076e6850a09bdc884ded5':
  docs: SDK r21.0.1 Release Notes
 2012-12-13 12:17:31 -08:00
Joe Fernandez
54091f8730 am 538c8d0a: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit '538c8d0a467187008b5e2249fdbea153d598f462':
  docs: NDK r8d Release Notes
 2012-12-13 12:15:51 -08:00
Joe Fernandez
86841bd5c1 am 700f9ea3: am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '700f9ea300f92da69800a48a2325a7f93a82e8cb':
  docs: SDK r21.0.1 Release Notes
 2012-12-13 12:15:24 -08:00
Joe Fernandez
538c8d0a46 Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 2012-12-13 12:14:03 -08:00
Joe Fernandez
700f9ea300 am 82703ea4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '82703ea4e842f59bda38cfb101ebaa3a8986aae3':
  docs: SDK r21.0.1 Release Notes
 2012-12-13 12:13:16 -08:00
Joe Fernandez
82703ea4e8 Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 2012-12-13 12:10:58 -08:00