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

40828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Xie
371ca8ca49 Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 2011-11-08 12:19:37 -08:00
Dianne Hackborn
4b91a35a6f Merge "Cleanup remote execution of perf tests." into ics-mr1 2011-11-08 11:52:58 -08:00
The Android Open Source Project
d9a661544e Reconcile with ics-mr0-release 
Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3
 2011-11-08 11:08:20 -08:00
Adam Cohen
a63aa04653 Merge "Making default widget padding public API" into ics-mr1 2011-11-08 10:53:39 -08:00
Andreas Huber
6304b42833 resolved conflicts for merge of 26f70db9 to master 
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
 2011-11-08 10:40:20 -08:00
Robert Greenwalt
0950014537 Merge "Fix build." into ics-mr1 2011-11-08 10:31:37 -08:00
Adam Powell
ccb01309ea Merge "Fix bug 5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1 2011-11-08 10:06:00 -08:00
Danielle Millett
acc37017ee Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 2011-11-08 10:03:24 -08:00
Robert Greenwalt
12c1aaafd5 Merge "Wimax : wimax framework related open source." into ics-mr1 2011-11-08 10:01:07 -08:00
Tom Taylor
ad5385f1f0 Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 2011-11-08 09:00:22 -08:00
Andreas Huber
4b50a6a902 Merge "Remove surface legacy APIs and code." into ics-mr1 2011-11-08 08:48:31 -08:00
John Reck
a7f4179992 am 99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1 
* commit '99015a2464a40097c3e23e07cdf69da0f886aa66':
  Remove unnecessary memory allocations
 2011-11-08 16:41:32 +00:00
John Reck
327714950f Merge "Remove unnecessary memory allocations" into ics-mr1 2011-11-08 08:38:07 -08:00
Eric Laurent
b5162170a7 am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1 
* commit 'f3a892ab9347ce733b81ccb4913a91c586f8f367':
  AudioFlinger: mix track only when really ready
 2011-11-08 16:37:11 +00:00
Eric Laurent
9104b8c640 Merge "AudioFlinger: mix track only when really ready" into ics-mr1 2011-11-08 08:32:57 -08:00
The Android Automerger
771c2ba2bf merge in ics-mr0-release history after reset to ics-mr0 2011-11-08 06:41:10 -08:00
Ed Heyl
ad0ff4dad2 am 9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" 
* commit '9d6a51623fdabbe993d7b8848794607394ef7cc2':
  Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
 2011-11-08 14:04:18 +00:00
Narayan Kamath
9362c3f368 am 98f5500c: Merge "Fix a bug in the network TTS api." into ics-mr1 
* commit '98f5500c71754dad428e00d569007e0b98dc8aee':
  Fix a bug in the network TTS api.
 2011-11-08 10:13:39 +00:00
Narayan Kamath
951be81f21 Merge "Fix a bug in the network TTS api." into ics-mr1 2011-11-08 02:09:18 -08:00
Gilles Debunne
3468f92fd6 am 39896f52: Merge "No more context menu in TextView" into ics-mr1 
* commit '39896f52a84947ffc2062a2584033ff749d90534':
  No more context menu in TextView
 2011-11-08 08:53:03 +00:00
Gilles Debunne
2240d7d0c4 Merge "No more context menu in TextView" into ics-mr1 2011-11-08 00:48:27 -08:00
Chih-Chung Chang
4bb742638c am 713c9a33: Merge "Fix 5509346: Resize the thumbnails if it\'s too large." into ics-mr1 
* commit '713c9a331e226c970af57c59ff17be29b73025c1':
  Fix 5509346: Resize the thumbnails if it's too large.
 2011-11-08 07:04:36 +00:00
James Dong
d4933c2a07 am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 
* commit 'ee7ebb3257d9337627b175835dc3d08f9b8ab339':
  Fix a hang issue where the first frame can be dropped for timelapse video recording.
 2011-11-08 07:00:34 +00:00
Matthew Xie
367ee7f345 am 67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5':
  Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-08 07:00:33 +00:00
Chih-Chung Chang
de89f8c6e6 Merge "Fix 5509346: Resize the thumbnails if it's too large." into ics-mr1 2011-11-07 22:59:55 -08:00
James Dong
87e906a6de Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 2011-11-07 22:57:02 -08:00
Matthew Xie
f8119b9d4a Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 2011-11-07 22:42:00 -08:00
Mathias Agopian
386aa98c4f Fix an issue where we could wait for a non-existing transaction 
This fixes the issue:
"Call not sent" dialog takes too long to dismiss after hitting OK"

Note: the system would recover after a 5 second timeout.

Bug: 5534520
Change-Id: Ifa37e594b50581f498479a5858672441b3d7dd87
 2011-11-07 21:58:03 -08:00
Mathias Agopian
0462805d1c am 7f1c94e1: Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1 
* commit '7f1c94e198e051bf481fd2d286c7b33d00664f9d':
  Fix rotation displays frame N-1 briefly while rotating
 2011-11-08 05:36:46 +00:00
Mathias Agopian
a5f9676ecc Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1 2011-11-07 21:33:53 -08:00
Jeff Brown
3401debfe4 Merge "Improve JavaDoc on AtomicFile." 2011-11-07 21:11:36 -08:00
Daniel Sandler
68eb0869e3 am c06669a3: Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1 
* commit 'c06669a303f2122a71e83d4813ecf78e6ff2b5a5':
  Fix scaling on notification panel wifi/battery icons.
 2011-11-08 03:50:34 +00:00
Daniel Sandler
7f65fd6024 Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1 2011-11-07 19:47:51 -08:00
Dianne Hackborn
c33597741c am 84b02130: Merge "Update perf tests to always run each test in a fresh process." into ics-mr1 
* commit '84b02130a9b3327343425cd4edfc1b85f1e9b23d':
  Update perf tests to always run each test in a fresh process.
 2011-11-08 02:51:40 +00:00
Dianne Hackborn
604823323a Merge "Update perf tests to always run each test in a fresh process." into ics-mr1 2011-11-07 18:46:54 -08:00
Adam Powell
a98adad8b6 am 13194b16: Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1 
* commit '13194b16d071ce70453a49e9462cfbeb7460d633':
  Fix bug 5534414 - Unselected tab states for Holo
 2011-11-08 01:59:52 +00:00
Adam Powell
bed040b8ea Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1 2011-11-07 17:55:17 -08:00
John Wang
f0cbf6f5b1 am 2f99bb5e: Merge "Remain in call audio mode while phone is offhook." into ics-mr1 
* commit '2f99bb5e4f706fee3dc1e08bdd66f58ea9844b09':
  Remain in call audio mode while phone is offhook.
 2011-11-08 00:50:36 +00:00
John Wang
30b08ffb38 Merge "Remain in call audio mode while phone is offhook." into ics-mr1 2011-11-07 16:46:11 -08:00
Robert Greenwalt
3ac73363e2 am 2d9ccdb4: am b445362b: Make upstream tether list threadsafe 
* commit '2d9ccdb4abd393375c5ae99445afbb8b0855d25c':
  Make upstream tether list threadsafe
 2011-11-07 23:41:20 +00:00
Robert Greenwalt
514f0440c0 am b445362b: Make upstream tether list threadsafe 
* commit 'b445362bd67cf596cfdd39db2dbe8f42cf9a119a':
  Make upstream tether list threadsafe
 2011-11-07 23:36:28 +00:00
John Reck
080a327ed3 am 669e1f80: Merge "Remove nativeRecordButtons" into ics-mr1 
* commit '669e1f80a718dc2a4d259970b4e85b3c66e8ebc1':
  Remove nativeRecordButtons
 2011-11-07 23:25:13 +00:00
John Reck
f4a9a39b0b Merge "Remove nativeRecordButtons" into ics-mr1 2011-11-07 15:20:38 -08:00
Andreas Huber
45c8822254 Merge "Use binary search to discover closest sync sample index, replace" 2011-11-07 15:04:56 -08:00
Svetoslav Ganov
0285974144 Merge "NumberPicker does not hide IME when flinged." 2011-11-07 15:03:07 -08:00
Adam Powell
d6022d0569 am b1dbf8e6: Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1 
* commit 'b1dbf8e605c29ac00dde187579bd8ff8f18d7ba3':
  Change the "start deferred" fragment API to "user visible hint"
 2011-11-07 23:01:48 +00:00
Adam Powell
4a55b46f07 Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1 2011-11-07 14:56:36 -08:00
Peter Ng
bd76a7854d am e1aacdfe: Merge "Added focused state to quickcontacts shortcut" into ics-mr1 
* commit 'e1aacdfe26eabf1ff31a6ddd8590fdea360614db':
  Added focused state to quickcontacts shortcut
 2011-11-07 22:41:13 +00:00
Peter Ng
f3a601b176 Merge "Added focused state to quickcontacts shortcut" into ics-mr1 2011-11-07 14:37:31 -08:00
Justin Ho
56364bc875 Merge "Merge: Correctly updating Roboto HHEA table to master Bug: 5516773" 2011-11-07 14:33:35 -08:00