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

94131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
771e5a6709 am 01ec5987: am da013c48: am f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev 
* commit '01ec5987d11be67f009a9d2eb3aabee95125090a':
  docs: remove developer survery link
 2012-12-17 11:49:00 -08:00
Scott Main
01ec5987d1 am da013c48: am f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev 
* commit 'da013c48d74aae3c5723eb569ebb324a94db27f2':
  docs: remove developer survery link
 2012-12-17 11:47:10 -08:00
Scott Main
da013c48d7 am f347e841: Merge "docs: remove developer survery link" into jb-mr1-dev 
* commit 'f347e841178358b248b5b1abed059079d2ca1ebe':
  docs: remove developer survery link
 2012-12-17 11:44:49 -08:00
Scott Main
f347e84117 Merge "docs: remove developer survery link" into jb-mr1-dev 2012-12-17 11:42:04 -08:00
Christopher Tate
eea47240b0 am 4b0ed017: Merge "BackupHelpers: Fix Typo" 
* commit '4b0ed0178de2c9c21bd5514671b8b4282f6a03db':
  BackupHelpers: Fix Typo
 2012-12-17 11:02:04 -08:00
Scott Main
ec558d520e docs: remove developer survery link 
Change-Id: I8f87e53df4f920ace7f8258c6cf0686ad4d8fead
 2012-12-17 10:52:40 -08:00
Sascha Prueter
8149820c2b am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev 
* commit '25458528f07ef9f4710e669b74b76d687bbc7645':
  Handle "CODE_ALREADY_PRESENT" message from Settings app
 2012-12-17 10:47:56 -08:00
Sascha Prueter
25458528f0 am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev 
* commit 'dd2ed93e4794dd8472593cdd21fb7e0056f11dbf':
  Handle "CODE_ALREADY_PRESENT" message from Settings app
 2012-12-17 10:46:04 -08:00
Sascha Prueter
dd2ed93e47 Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev 2012-12-17 10:42:55 -08:00
Christopher Tate
4b0ed0178d Merge "BackupHelpers: Fix Typo" 2012-12-17 10:39:41 -08:00
Robert Ly
1d349dd4ee am 5d2de143: am 4664782f: am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev 
* commit '5d2de143883381fb65b026b0975730970e6f33c7':
  docs: update gms auth docs for bug 7737187
 2012-12-17 10:31:45 -08:00
Robert Ly
5d2de14388 am 4664782f: am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev 
* commit '4664782f88ef1dad1b16a18d51947132d650afeb':
  docs: update gms auth docs for bug 7737187
 2012-12-17 10:30:00 -08:00
Robert Ly
4664782f88 am f93a2941: Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev 
* commit 'f93a2941ad8ec72f288669da2426605ad85a98ca':
  docs: update gms auth docs for bug 7737187
 2012-12-17 10:28:01 -08:00
Robert Ly
f93a2941ad Merge "docs: update gms auth docs for bug 7737187" into jb-mr1-dev 2012-12-17 10:25:29 -08:00
Craig Mautner
1e9444797d am 367921dd: (-s ours) Merge "Toast: fix force close if called from system service" 
* commit '367921dd879cbc041852b121ce35b3c12803d853':
  Toast: fix force close if called from system service
 2012-12-17 09:40:02 -08:00
Craig Mautner
367921dd87 Merge "Toast: fix force close if called from system service" 2012-12-17 09:05:07 -08:00
Pawit Pornkitprasan
35e4a7029e Toast: fix force close if called from system service 
If a toast is created from a system service, an application context
will not be available, use the service context instead.

Fixes
http://code.google.com/p/android/issues/detail?id=40058
http://code.google.com/p/android/issues/detail?id=40075

Change-Id: Ic643f4557fa04476819cd2c3ee640b735eeae429
 2012-12-17 18:04:17 +07:00
satok
6bad2f2fef Handle "CODE_ALREADY_PRESENT" message from Settings app 
Bug: 7725834
Change-Id: I85c35e73978d606edf9687e2de76c6ffc3c3ee2b
 2012-12-17 15:02:04 +09:00
You Kim
8b2e2c8abc BackupHelpers: Fix Typo 
delete --> free

Change-Id: Idbf7e677f8cc4a9a9d04e58b5cf7d0f1589c5211
 2012-12-17 03:36:10 +09:00
Elliott Hughes
6647f1bd2b am c749261f: Merge "Fix DateUtils.formatElapsedTime." 
* commit 'c749261fea1010dfa2d1337bd210c81d13052540':
  Fix DateUtils.formatElapsedTime.
 2012-12-15 14:58:01 -08:00
Marco Nelissen
50c782190d am 01f42639: Merge "fix typo in docs" 
* commit '01f42639f21ec98feb5e5d458632a1a1005b17e8':
  fix typo in docs
 2012-12-15 14:57:51 -08:00
Elliott Hughes
898d8048b6 am 2eca1b53: Merge "Add return after NULL check in JetPlayer" 
* commit '2eca1b53ae905f5ddaebaff7156340efdf97cb84':
  Add return after NULL check in JetPlayer
 2012-12-15 14:57:46 -08:00
Amith Yamasani
507ea24b8f am ffdc7aed: Merge "avoid crashing system serer process" 
* commit 'ffdc7aed5ec8f38706ddfad02d3df05493351083':
  avoid crashing system serer process
 2012-12-15 14:57:40 -08:00
Elliott Hughes
c749261fea Merge "Fix DateUtils.formatElapsedTime." 2012-12-14 17:39:19 -08:00
Elliott Hughes
2eda18485c Fix DateUtils.formatElapsedTime. 
More reuse of StringBuilders, less broken home-grown formatting code.

Long-term, we should hand this over to icu4c, but they're not ready yet.

Bug: http://code.google.com/p/android/issues/detail?id=41401
Bug: 7736688
Change-Id: Ib3c1e1aad05827df646aa18645cce19dffb7551f
 2012-12-14 14:29:47 -08:00
The Android Open Source Project
17a890729e Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I5ffbdc1a3993d684898a61c818cfec1a8ff8ce4b
 2012-12-14 14:03:22 -08:00
The Android Automerger
b70b69c417 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-14 13:56:13 -08:00
Robert Ly
292bed2055 docs: update gms auth docs for bug 7737187 
Change-Id: I32c39bbe39ff7d84ea88aeac2ca11a0110700266
 2012-12-14 13:31:52 -08:00
Baligh Uddin
3ffa379878 am 8a3eb664: am 435c0374: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '8a3eb6644cc99cd991319dc487446689eb0907e8':
  Import translations. DO NOT MERGE
 2012-12-14 12:01:57 -08:00
Baligh Uddin
8a3eb6644c am 435c0374: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '435c03749abd6f504dd5f6dd3c5c3b4d549ff702':
  Import translations. DO NOT MERGE
 2012-12-14 11:59:50 -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
Baligh Uddin
435c03749a Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-14 11:57:45 -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
Scott Main
8ac78803f5 docs: add cursorloader class to side nav 
Change-Id: I1be67b98f71b9e3759b06b851c30b49f8ccdef64
 2012-12-14 11:39:03 -08:00
Baligh Uddin
0c2f090d23 Import translations. DO NOT MERGE 
Change-Id: I4e8489952075f530451f167537a5f996380ae63d
Auto-generated-cl: translation import
 2012-12-14 11:25:30 -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
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
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