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

40755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Steve Block
50760d481e Merge "Clean up JavaDoc for WebView.addJavascriptInterface()" 2011-11-09 09:43:53 -08:00
Robert Greenwalt
e9d5835aa0 Merge "resolved conflicts for merge of ea54b760 to master" 2011-11-09 09:10:42 -08:00
Robert Greenwalt
129f890205 resolved conflicts for merge of ea54b760 to master 
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
 2011-11-09 09:03:59 -08:00
Steve Block
fe07f201ba Merge "Add another test for WebView's Java Bridge" 2011-11-09 08:49:37 -08:00
Dianne Hackborn
1bf50366ea am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1 
* commit 'cd489c4ce59c134c384238cbb613ede34f28189c':
  Don't crash if there is no connectivity service.
 2011-11-09 14:36:44 +00:00
Svetoslav Ganov
86f370da76 am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1 
* commit '1bef480b223f03d0fc866f08ca101a07ead89bc2':
  NumberPicker incorectly enforcing minimal width and height.
 2011-11-09 14:36:39 +00:00
Jeff Sharkey
48e5483f44 am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1 
* commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a':
  Avoid inconsistent state when remove fails.
 2011-11-09 14:36:36 +00:00
Jeff Brown
18fc2a2723 am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 
* commit 'bc0b010ecc7254b0e2c7a0268e5242557579b471':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
 2011-11-09 14:36:34 +00:00
Mathias Agopian
a364841e31 am 393e2c1f: Merge "SensorService now always clamps the requested rate" into ics-mr1 
* commit '393e2c1f7aad37e7851643df22e4810996c26d1f':
  SensorService now always clamps the requested rate
 2011-11-09 14:36:31 +00:00
Dianne Hackborn
a0e7618c25 am 3af8b88d: Merge "Add drop box reports of low memory." into ics-mr1 
* commit '3af8b88d032011fdbc6c498cf3f3881281cff999':
  Add drop box reports of low memory.
 2011-11-09 14:36:29 +00:00
Michael Kolb
3afe164fcd am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1 
* commit 'a4293ba1a0f1129d5879ae9eda45292ff357e20c':
  Remove flicker from WebTextView
 2011-11-09 14:36:22 +00:00
Jamie Gennis
f4fe83f96d am d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1 
* commit 'd211b4882a662409b85a1f90c71e28faa9c54464':
  SurfaceTexture: unhide setDefaultBufferSize
 2011-11-09 14:36:15 +00:00
Jamie Gennis
d834b2f85d am 911263dc: Merge changes I18e5e789,I5cbaae2d into ics-mr1 
* commit '911263dc5df48b89e8f9010fb74dfe2649bdc442':
  EGL: implement loading and saving the cache
  EGL: use an in-memory the blob cache
 2011-11-09 14:36:14 +00:00
Mathias Agopian
312f6c76eb am 95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1 
* commit '95482b61c348fc54bf44a96a8b73011c90b40520':
  Fix an issue where we could wait for a non-existing transaction
 2011-11-09 14:36:11 +00:00
Irfan Sheriff
72f7fbeac3 am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1 
* commit '59c73b92a9ef8df5d4873bc36f05b776c3a476bc':
  Convert soft ap config store to state machine
 2011-11-09 14:36:09 +00:00
JP Abgrall
09e1068230 Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp 2011-11-09 14:36:09 +00:00
Dave Santoro
616bbbd10b am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1 
* commit 'b78ae7524eecbca01a53994d6872202633c8341b':
  Unhide social stream APIs for Contacts.
 2011-11-09 14:36:00 +00:00
Adam Powell
ce78e11ad8 am 650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1 
* commit '650a3e8894c6d26b258d26bdec856fde7aba43d6':
  Fix the action bar menu layout to use the correct divider drawable.
 2011-11-09 14:35:59 +00:00
Wei Huang
ce417ad019 am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1 
* commit 'ea50748b546e7dc21dc06195af5f0a8f2b812417':
  Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
 2011-11-09 14:35:56 +00:00
Matthew Xie
cd99c18818 am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-09 14:35:53 +00:00
Dianne Hackborn
f96004644b am 665e105f: Merge "Cleanup remote execution of perf tests." into ics-mr1 
* commit '665e105f145fcb27a54d53c6c9382bebf50a56d7':
  Cleanup remote execution of perf tests.
 2011-11-09 14:35:51 +00:00
The Android Open Source Project
5ae931bb74 am 6dee1a9d: Reconcile with ics-mr0-release 
* commit '6dee1a9d046458134fb019669b5ffe7911dcdb29':
 2011-11-09 14:35:48 +00:00
Adam Cohen
8f002f0ab6 am 75b20380: Merge "Making default widget padding public API" into ics-mr1 
* commit '75b2038004f3338c68c9a0e89b29a31e10b237da':
  Making default widget padding public API
 2011-11-09 14:35:45 +00:00
Glenn Kasten
086e2da211 am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit '19998120f53caceb620f138c6eea182f1e693660':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 14:35:18 +00:00
Tom Taylor
52920840e2 am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 
* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
  Add new secure setting for controlling Messaging notifications
 2011-11-09 14:34:18 +00:00