ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
40,901 Commits 2 Branches 0 Tags 54 MiB
7b000f190c
Commit Graph

40901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
b70b05b799 am 028fe5a7: am 2048789c: Merge "Dispatch alerts through background thread." into ics-mr1 
* commit '028fe5a715d8f9d78154e482dc46b27f97f94e53':
  Dispatch alerts through background thread.
 2011-11-09 21:51:37 +00:00
Jeff Sharkey
c1552291e7 am cef1300e: am f3882914: Merge "Make policy data enabled flag static." into ics-mr1 
* commit 'cef1300ebd6bc88e93ee1420e5fec359531533d2':
  Make policy data enabled flag static.
 2011-11-09 21:51:35 +00:00
Daniel Sandler
c0482484d2 am f01a9c04: am da738d63: Merge "Add day of week." into ics-mr1 
* commit 'f01a9c0476191b3bbd9553c10421a1fee3c92353':
  Add day of week.
 2011-11-09 21:51:33 +00:00
Mathias Agopian
3ca7e20fb0 am a508f056: am e4a1bafb: Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1 
* commit 'a508f056d0b5a439b9436604824739049fd25be6':
  decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes.
 2011-11-09 21:51:32 +00:00
Dianne Hackborn
d7713cbfc1 am 0141b727: am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1 
* commit '0141b7275e4597e5944752d4f4ea3707c2b4f465':
  Don't crash if there is no connectivity service.
 2011-11-09 21:51:30 +00:00
Svetoslav Ganov
1036ed8ca2 am cc03abe1: am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 
* commit 'cc03abe1fc51a62e65f22944c3a4cba5dd3c34d3':
  NumberPicker incorectly enforcing minimal width and height.
 2011-11-09 21:51:28 +00:00
Jeff Sharkey
570ce763bb am 79c4ad17: am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1 
* commit '79c4ad17f966d0ccf24d94fdcbc6d3f83e359604':
  Avoid inconsistent state when remove fails.
 2011-11-09 21:51:26 +00:00
Jeff Brown
116fd6bc25 am 0816b0c8: am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 
* commit '0816b0c871ea93ffbcd3c60151d067dcfcebc1ac':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
 2011-11-09 21:51:25 +00:00
Mathias Agopian
b2f197c5fc am 64370354: am 393e2c1f: Merge "SensorService now always clamps the requested rate" into ics-mr1 
* commit '6437035400ae63a6f3eb2e375cb979bdd0037ba0':
  SensorService now always clamps the requested rate
 2011-11-09 21:51:23 +00:00
Dianne Hackborn
2ec97010e0 am 3b2681ba: am 3af8b88d: Merge "Add drop box reports of low memory." into ics-mr1 
* commit '3b2681bad989013154f90c4b9c31f074af1f822c':
  Add drop box reports of low memory.
 2011-11-09 21:51:21 +00:00
Michael Kolb
d85030c32e am 3a77503c: am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1 
* commit '3a77503ca16253a702977a11406aec7a332837cb':
  Remove flicker from WebTextView
 2011-11-09 21:51:19 +00:00
Jamie Gennis
c749b2dc56 am 7e6c75f5: am d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1 
* commit '7e6c75f5a57b42edf22ce4e2cf144016252066c5':
  SurfaceTexture: unhide setDefaultBufferSize
 2011-11-09 21:51:17 +00:00
Jamie Gennis
2ea8829002 am 3cb007e4: am 911263dc: Merge changes I18e5e789,I5cbaae2d into ics-mr1 
* commit '3cb007e44db1e169747528f62a118575f3b04d56':
  EGL: implement loading and saving the cache
  EGL: use an in-memory the blob cache
 2011-11-09 21:51:16 +00:00
Mathias Agopian
49f9c49c09 am 0170810c: am 95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1 
* commit '0170810ce468d1b028cb65027ebc33f1375f5d3f':
  Fix an issue where we could wait for a non-existing transaction
 2011-11-09 21:51:14 +00:00
Irfan Sheriff
b11e7f48ee am 1c9126c6: am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1 
* commit '1c9126c64b56b6465fd551680461caed2e1ea20d':
  Convert soft ap config store to state machine
 2011-11-09 21:51:12 +00:00
JP Abgrall
e1ee9d1d0b am b4a96805: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp 
* commit 'b4a96805d69b1f6281ece568b07927da2dd50872':
 2011-11-09 21:51:10 +00:00
Dave Santoro
31d16cf95b am 8e2c5113: am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1 
* commit '8e2c51137cdd1917d36c3a78ff6c1a42cc8ea402':
  Unhide social stream APIs for Contacts.
 2011-11-09 21:51:08 +00:00
Adam Powell
cf16ecc5f9 am b7dc4a33: am 650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1 
* commit 'b7dc4a33166bd24cc1ce5fa8c3ef27618a54e274':
  Fix the action bar menu layout to use the correct divider drawable.
 2011-11-09 21:51:06 +00:00
Wei Huang
c6aabe5c78 am e64022ca: am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1 
* commit 'e64022ca65e36c743eca260f05f245fe9d90f80c':
  Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
 2011-11-09 21:51:04 +00:00
Matthew Xie
bd04983ecc am 3a6f9ded: am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '3a6f9ded543db6cb7a2842540a2b67b0356b21ae':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-09 21:51:01 +00:00
Dianne Hackborn
935409192b am 03507014: am 665e105f: Merge "Cleanup remote execution of perf tests." into ics-mr1 
* commit '0350701422eb484d57c5c3bb1e8fa72f03ab280b':
  Cleanup remote execution of perf tests.
 2011-11-09 21:50:59 +00:00
The Android Open Source Project
acdd28257b am 5a903cd0: am 6dee1a9d: Reconcile with ics-mr0-release 
* commit '5a903cd0b6e7c52ffeb01aadfc55eb78e4fa72e6':
 2011-11-09 21:50:56 +00:00
Adam Cohen
bf6d628454 am 068b7f02: am 75b20380: Merge "Making default widget padding public API" into ics-mr1 
* commit '068b7f02a35e969c1607f8a35c422c93ee72c8a3':
  Making default widget padding public API
 2011-11-09 21:50:54 +00:00
Robert Ly
3f3aca8f5a am 69db5695: am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0 
* commit '69db56958fdac41a093cd6cf00cbe200f2885730':
  docs: update samples toc for rs sample
 2011-11-09 21:28:23 +00:00
Robert Ly
3e22d75179 am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0 
* commit 'bd4bdbec62776b1222b1f202e44f8f127bfb7bab':
  docs: update samples toc for rs sample
 2011-11-09 21:25:45 +00:00
Robert Ly
341e1624ab Merge "docs: update samples toc for rs sample" into ics-mr0 2011-11-09 13:23:34 -08:00
Glenn Kasten
941c02754c am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit 'bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 21:19:00 +00:00
Jake Hamby
be0b30e48b am 2c6539e8: am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 
* commit '2c6539e83ea80c62ee1a299fb686b4bdf043bfa7':
  Fix exception when sending multi-page SMS with Turkish characters.
 2011-11-09 21:18:56 +00:00
Brian Colonna
bcedde8848 resolved conflicts for merge of 7cf1eeb9 to master 
Change-Id: Id125e315e24ced927f3a500135af7e5aff50cfa2
 2011-11-09 16:13:51 -05:00
Jamie Gennis
d4e367fb86 am 97ece7a9: Merge "EGL: add deferred saving of the cache" into ics-mr1 
* commit '97ece7a95f76ec724633d4f4764291ea4dc20933':
  EGL: add deferred saving of the cache
 2011-11-09 19:48:29 +00:00
Jamie Gennis
72f172e79f Merge "EGL: add deferred saving of the cache" into ics-mr1 2011-11-09 11:46:45 -08:00
Robert Greenwalt
edb08eed68 am 604019c8: Merge "Fix build." into ics-mr1 
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.
 2011-11-09 19:34:50 +00:00
Adam Powell
31b59d19b5 am 8689afbd: Merge "Fix bug 5544103 - Spinner text doesn\'t look dimmed when disabled" into ics-mr1 
* commit '8689afbd63db3b1af6058709da843ea9d6433b21':
  Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
 2011-11-09 19:34:47 +00:00
Danielle Millett
ab3b1b497b am b9b08257: Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 
* commit 'b9b08257370d244b4bccc4e243dda3c4daf4b0af':
  Showing a congratulations screen after choosing face unlock backup lock
 2011-11-09 19:34:44 +00:00
Jeff Brown
507396958b am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1 
* commit 'e7de36e605e0ccf4552c8ee1db40cb9af3227cf4':
  Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
 2011-11-09 19:21:50 +00:00
Jeff Brown
412e23044b Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1 2011-11-09 11:20:24 -08:00
Peter Ng
79f9d1757b am 34dd937b: Merge "Making quicksettings opaque again" into ics-mr1 
* commit '34dd937be1a325fd92d6479822960e4ca13f2420':
  Making quicksettings opaque again
 2011-11-09 18:59:18 +00:00
Peter Ng
a38d1c8390 Merge "Making quicksettings opaque again" into ics-mr1 2011-11-09 10:57:23 -08:00
Steve Block
50760d481e Merge "Clean up JavaDoc for WebView.addJavascriptInterface()" 2011-11-09 09:43:53 -08:00
John Reck
c8c8c7a9a0 am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1 
* commit '36a7f2a9adfa21ec31f00d496fef82e68931c860':
  Fix determining find on page overlap
 2011-11-09 17:30:39 +00:00
John Reck
d714c83962 Merge "Fix determining find on page overlap" into ics-mr1 2011-11-09 09:28:11 -08:00
Robert Greenwalt
e9d5835aa0 Merge "resolved conflicts for merge of ea54b760 to master" 2011-11-09 09:10:42 -08:00
The Android Open Source Project
ef3da468af am eae6c997: Reconcile with ics-mr0-release 
* commit 'eae6c9972d91b9af58c3bf7ba0235c0a3e95c408':
 2011-11-09 17:03:59 +00:00
Robert Greenwalt
129f890205 resolved conflicts for merge of ea54b760 to master 
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
 2011-11-09 09:03:59 -08:00
The Android Open Source Project
bea63fd645 Reconcile with ics-mr0-release 
Change-Id: I20113f16c260f8f796a0d370ea105ee17bdaea63
 2011-11-09 09:00:40 -08:00
Jean-Michel Trivi
72aa4697fa am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1 
* commit '20cf0916cc6a4920b1d882a9478615a15fe6b3b0':
  Bug 5585323 New system permission for media decode
 2011-11-09 16:59:48 +00:00
Jean-Michel Trivi
bd33207d68 Merge "Bug 5585323 New system permission for media decode" into ics-mr1 2011-11-09 08:57:43 -08:00
Steve Block
fe07f201ba Merge "Add another test for WebView's Java Bridge" 2011-11-09 08:49:37 -08:00
David Brown
0455970132 am b6b44cef: am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0 
* commit 'b6b44cef94a38b6f403b43f55d77d3602de18a3c':
  Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
 2011-11-09 16:44:53 +00:00
Glenn Kasten
d1d81e5874 am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit 'f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':
 2011-11-09 16:44:51 +00:00