drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,852 Commits 1 Branch 0 Tags
223172045f
Commit Graph

96852 Commits

Author SHA1 Message Date
Michael Jurka
223172045f am 4ed32c24: am d2de8033: am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 
* commit '4ed32c248a70fb3ab4d36def8f73e5b88b7fc3d5':
  Disable adding keyguard widgets until setup is done
 2012-11-29 15:58:14 -08:00
Michael Jurka
4ed32c248a am d2de8033: am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 
* commit 'd2de8033a304e951426e66e1f2c800402271c5e3':
  Disable adding keyguard widgets until setup is done
 2012-11-29 15:56:34 -08:00
Michael Jurka
d2de8033a3 am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 
* commit 'a8d63ec9f328e56d9ccad385f137a30fa104c1a7':
  Disable adding keyguard widgets until setup is done
 2012-11-29 15:54:47 -08:00
Michael Jurka
a8d63ec9f3 Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 2012-11-29 15:51:13 -08:00
The Android Open Source Project
f679b81026 am 5196cb6f: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '5196cb6fa097e856d10671bc545776b13102770b':
  trigger kernel blocked stack trace on system server watchdog
 2012-11-29 15:47:09 -08:00
The Android Open Source Project
5196cb6fa0 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: Ib7a3e7b3af9ef848b763cf498c6757ad5658fc80
 2012-11-29 15:41:04 -08:00
Robert Ly
1543fcdf9c am 8f0f9514: am 8569af30: am 5915f61e: am 830b23b7: docs: gms javadocs 
* commit '8f0f95141875ed7451133b5dc39da68f9f9a54e4':
  docs: gms javadocs
 2012-11-29 14:34:05 -08:00
Robert Ly
721db20c12 am d88e1a1f: am a93d0e09: am 64208d23: am aae17137: docs: update gms toc and landing pages 
* commit 'd88e1a1f78c46214a27c9154f277593de8016777':
  docs: update gms toc and landing pages
 2012-11-29 14:33:58 -08:00
Robert Ly
d1776219e1 am 8587f04c: am 206979c9: am 8f1371af: am 64e4ed8d: Merge "docs: fix bug 7628699" into jb-mr1-dev 
* commit '8587f04caef5a24f209b178b3906c031517e9aec':
  docs: fix bug 7628699
 2012-11-29 14:33:53 -08:00
Colin Cross
5a160856b7 am 372bb238: am 418af932: am 05db19bc: Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev 
* commit '372bb2380d4a466196aa2b6142111f1c84abd1a5':
  trigger kernel blocked stack trace on system server watchdog
 2012-11-29 14:33:48 -08:00
Dianne Hackborn
5c1eb690bb am 84ea428d: am ed8c323a: am 38e84700: Merge "Fix issue : When changing the font settings, the movie..." into jb-mr1.1-dev 
* commit '84ea428d24dedc4b9a44bf6b2c9419b3545a03b8':
  Fix issue : When changing the font settings, the movie...
 2012-11-29 14:33:44 -08:00
John Spurlock
dd24523f5e am a3aef5ff: am 43658bae: am 143d73da: Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev 
* commit 'a3aef5ff62e1dbdf85c3a7498202d04c808a92da':
  Fix multiuser bug in StatusBarManagerService.
 2012-11-29 14:33:41 -08:00
John Spurlock
0313864236 am 721aaead: am 1428384c: am 958343c1: Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev 
* commit '721aaead07c162ad745e5ed4d7e549f89c8b9a60':
  Fix for navbar back/home appearing in keyguard (multiuser).
 2012-11-29 14:33:37 -08:00
Scott Main
292624d8ae am 35837ebb: am 3aabc564: am bf0e87a4: am 77ea05d0: Merge "docs: update landing page for Google Services" into jb-mr1-dev 
* commit '35837ebb0c0b6ae83c2d05a6138e7aff1605013d':
  docs: update landing page for Google Services
 2012-11-29 14:33:33 -08:00
Daniel Sandler
7d77752754 am e196eb76: am a8a63dd7: am 154e2d7d: Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev 
* commit 'e196eb76428976df1bf5ee75ff81bdaa30d796b6':
  Flush the clock format when the locale changes.
 2012-11-29 14:33:30 -08:00
Victoria Lease
aee37a30df am a5fa0495: am 4b77660b: am 7023b3b0: Merge "clarify Geofence.createCircle() param ranges" into jb-mr1.1-dev 
* commit 'a5fa049562333ad154c38e47d0ec7845941d6c21':
  clarify Geofence.createCircle() param ranges
 2012-11-29 14:33:26 -08:00
Christopher Tate
82b4241ffc am 45972e7c: am fac7b0a6: am 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt 
* commit '45972e7cf03ae95c4829f9d5a819870d5d609310':
  Cache resource ID lookups in aapt
 2012-11-29 14:33:23 -08:00
Craig Mautner
a2c5eabc8d am d08fc869: (-s ours) am 4317b341: am 24d966a3: Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'd08fc869646f272b9fd49d66293dcea7d29d6c88':
  Fix math errors causing black screen. DO NOT MERGE
 2012-11-29 14:33:19 -08:00
zzy
0a3b9017ed am de95a276: am 3fe63ce4: am 652678af: timeout support for accept() and added check for signal size 
* commit 'de95a276e7caf3b9918c21a4f43f91c7c25b3a6b':
  timeout support for accept() and added check for signal size
 2012-11-29 14:33:14 -08:00
Fabrice Di Meglio
0feedf9982 am cd91470a: am 146b1290: am cdc6d5cf: Merge "Fix bug RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev 
* commit 'cd91470aad09ee7b501ed1d585b9a23f66a718b6':
  Fix bug  RelativeLayout is not having the correct width when in RTL mode
 2012-11-29 14:33:10 -08:00
Adam Powell
b34aedcf68 am 8912a72c: am 46263369: am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev 
* commit '8912a72cb2e97f595d3026da973ae99db1bb64b9':
  Fix time-related ScaleGestureDetector methods
 2012-11-29 14:33:06 -08:00
Adam Powell
03919d4084 am 2a1f11e9: am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 
* commit '2a1f11e9750951d072d04155cfe3b7b7f7b96bb7':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
 2012-11-29 14:33:00 -08:00
Adam Powell
04173385b6 am 1126c2a6: am 76ee9a9c: am 738b1903: Merge "Import assets from UX" into jb-mr1.1-dev 
* commit '1126c2a693421fe178d52e0543f32d585848e506':
  Import assets from UX
 2012-11-29 14:32:56 -08:00
Dianne Hackborn
71e00c2330 am b2e18e91: am b443ddbb: am 2c41c4a2: Fix build. 
* commit 'b2e18e91ec1f9c521b69e44761db2805e3a61ba3':
  Fix build.
 2012-11-29 14:32:52 -08:00
Dianne Hackborn
42e06c8d6b am 5007dea9: am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev 
* commit '5007dea96e357e11316f5c9a4aea1123ba9dd4c1':
  Cleaner initial boot.
 2012-11-29 14:32:49 -08:00
Chris Craik
c4aa38a1e3 am c0da873e: am a9473881: am 2435f98d: Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev 
* commit 'c0da873ee25e1e67fd0454ebc2473a5c3cac002c':
  Use the same interrupt/resume logic for all functor calls
 2012-11-29 14:32:45 -08:00
Adam Cohen
70a649ca51 am 20b9edd8: am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '20b9edd805777bf9e603d8008650c23b031dac79':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-29 14:32:41 -08:00
Robert Greenwalt
6bc32a73b9 am 81cf3abd: am 10659cb1: am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 
* commit '81cf3abdd52bdf212e742c88c53b00969f7cc34f':
  Secure a handful of framework broadcasts
 2012-11-29 14:32:37 -08:00
Irfan Sheriff
4d14f6bb81 am 61b00239: am 0cec3de3: am b4d5a9e7: Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev 
* commit '61b00239dda1d0c5e7c34e88ad9f56817543d0b8':
  WFD: Fallback to PIN mode if PBC is not supported
 2012-11-29 14:32:33 -08:00
Fabrice Di Meglio
b75fb5daf6 am 52c3833e: am 07581745: am 71175f72: Merge "Fix bug Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 
* commit '52c3833e20d0e78fcb367c1e81cd2c83f9165a0a':
  Fix bug  Radio button/TextView drawable regression in 4.2
 2012-11-29 14:32:30 -08:00
Dianne Hackborn
36893b16ce am 221d59f7: am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit '221d59f723584d316ea225bdaf1bc75cbfd7a794':
  Quiet down a lot of logging.
 2012-11-29 14:32:25 -08:00
Robert Ly
8f0f951418 am 8569af30: am 5915f61e: am 830b23b7: docs: gms javadocs 
* commit '8569af3011d0e3f74bb82a869c05879e1493ac07':
  docs: gms javadocs
 2012-11-29 14:28:59 -08:00
Robert Ly
d88e1a1f78 am a93d0e09: am 64208d23: am aae17137: docs: update gms toc and landing pages 
* commit 'a93d0e09301b8783bafc486231519385e85a28fe':
  docs: update gms toc and landing pages
 2012-11-29 14:28:55 -08:00
Robert Ly
8587f04cae am 206979c9: am 8f1371af: am 64e4ed8d: Merge "docs: fix bug 7628699" into jb-mr1-dev 
* commit '206979c9ac13bec6bc550946a410ace94b8ca343':
  docs: fix bug 7628699
 2012-11-29 14:28:37 -08:00
Colin Cross
372bb2380d am 418af932: am 05db19bc: Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev 
* commit '418af9323fcb2363636bf4072c230a8adebfcc86':
  trigger kernel blocked stack trace on system server watchdog
 2012-11-29 14:28:33 -08:00
Dianne Hackborn
84ea428d24 am ed8c323a: am 38e84700: Merge "Fix issue : When changing the font settings, the movie..." into jb-mr1.1-dev 
* commit 'ed8c323a6c776540de356d6fc7d902cc5916fef5':
  Fix issue : When changing the font settings, the movie...
 2012-11-29 14:28:24 -08:00
John Spurlock
a3aef5ff62 am 43658bae: am 143d73da: Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev 
* commit '43658bae9cdb5307d54fa36f3e57def9d0991150':
  Fix multiuser bug in StatusBarManagerService.
 2012-11-29 14:28:18 -08:00
John Spurlock
721aaead07 am 1428384c: am 958343c1: Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev 
* commit '1428384c6217c843169e233dc934d5fcbf18a792':
  Fix for navbar back/home appearing in keyguard (multiuser).
 2012-11-29 14:28:15 -08:00
Scott Main
35837ebb0c am 3aabc564: am bf0e87a4: am 77ea05d0: Merge "docs: update landing page for Google Services" into jb-mr1-dev 
* commit '3aabc564253b9dd53f18c7111767190b22109cb4':
  docs: update landing page for Google Services
 2012-11-29 14:28:11 -08:00
Daniel Sandler
e196eb7642 am a8a63dd7: am 154e2d7d: Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev 
* commit 'a8a63dd7d9d49930b70371319b5712aed17a9c4c':
  Flush the clock format when the locale changes.
 2012-11-29 14:28:07 -08:00
Victoria Lease
a5fa049562 am 4b77660b: am 7023b3b0: Merge "clarify Geofence.createCircle() param ranges" into jb-mr1.1-dev 
* commit '4b77660b38cfff2ffb67c15db4c9e20adaac41d7':
  clarify Geofence.createCircle() param ranges
 2012-11-29 14:28:04 -08:00
Christopher Tate
45972e7cf0 am fac7b0a6: am 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt 
* commit 'fac7b0a60306d851d903730ccc408a0272e866db':
  Cache resource ID lookups in aapt
 2012-11-29 14:27:56 -08:00
Craig Mautner
d08fc86964 am 4317b341: am 24d966a3: Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev 
* commit '4317b3418b144c162634ec647df76a484ac35612':
  Fix math errors causing black screen. DO NOT MERGE
 2012-11-29 14:27:43 -08:00
zzy
de95a276e7 am 3fe63ce4: am 652678af: timeout support for accept() and added check for signal size 
* commit '3fe63ce4a97a448e6f91754b6b9fa80eecead40b':
  timeout support for accept() and added check for signal size
 2012-11-29 14:27:33 -08:00
Fabrice Di Meglio
cd91470aad am 146b1290: am cdc6d5cf: Merge "Fix bug RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev 
* commit '146b129075bfe879aa09888744d1ba8de06f331a':
  Fix bug  RelativeLayout is not having the correct width when in RTL mode
 2012-11-29 14:27:05 -08:00
Adam Powell
8912a72cb2 am 46263369: am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev 
* commit '462633695774a3cfd84b5c729266d039ec686a64':
  Fix time-related ScaleGestureDetector methods
 2012-11-29 14:27:01 -08:00
Adam Powell
2a1f11e975 am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 
* commit '57c23a464a8428f089531a5d3cab20c81eb6ccee':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
 2012-11-29 14:26:57 -08:00
Adam Powell
1126c2a693 am 76ee9a9c: am 738b1903: Merge "Import assets from UX" into jb-mr1.1-dev 
* commit '76ee9a9c171d08802b44883be54b32dc31aa680b':
  Import assets from UX
 2012-11-29 14:26:49 -08:00
Dianne Hackborn
b2e18e91ec am b443ddbb: am 2c41c4a2: Fix build. 
* commit 'b443ddbbc7f1c7ed2d30310f80323cd4a5bf3e8d':
  Fix build.
 2012-11-29 14:26:45 -08:00
Dianne Hackborn
5007dea96e am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev 
* commit 'bac91ebdd0ae310a6b92a8b4bb91613025238356':
  Cleaner initial boot.
 2012-11-29 14:26:37 -08:00