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

40318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Glenn Kasten
842caaa0af Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0 2011-11-08 17:31:32 -08:00
Irfan Sheriff
5036774acd Merge "Convert soft ap config store to state machine" into ics-mr1 2011-11-08 15:51:43 -08:00
Dave Santoro
021ae663a5 Merge "Unhide social stream APIs for Contacts." into ics-mr1 2011-11-08 14:48:21 -08:00
Adam Powell
32dbf75850 Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1 2011-11-08 14:32:29 -08:00
Jake Hamby
376193d656 am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 
* commit 'fee5f29b22f99bd2891fb2af54669f20832fb851':
  Fix exception when sending multi-page SMS with Turkish characters.
 2011-11-08 22:02:49 +00:00
Brian Colonna
2e3f265633 am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 
* commit '04217efb8eaebdbd846671a2f743fa3e960b5dde':
  Fix 5514230: preventing null window token from occurring
 2011-11-08 22:02:48 +00:00
Jake Hamby
9db7f39431 Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 2011-11-08 13:22:34 -08:00
Wei Huang
666a5e7e84 Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1 2011-11-08 13:16:02 -08:00
Brian Colonna
211e1d4227 Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 2011-11-08 12:51:36 -08:00
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
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
327714950f Merge "Remove unnecessary memory allocations" into ics-mr1 2011-11-08 08:38:07 -08: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
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
2240d7d0c4 Merge "No more context menu in TextView" into ics-mr1 2011-11-08 00:48:27 -08: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
a5f9676ecc Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1 2011-11-07 21:33:53 -08: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
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
bed040b8ea Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1 2011-11-07 17:55:17 -08: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
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
f4a9a39b0b Merge "Remove nativeRecordButtons" into ics-mr1 2011-11-07 15:20:38 -08: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
f3a601b176 Merge "Added focused state to quickcontacts shortcut" into ics-mr1 2011-11-07 14:37:31 -08:00
Jim Miller
387b21efed Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1 2011-11-07 14:24:43 -08:00
Peter Ng
68d563b546 Merge "Color balancing framework assets" into ics-mr1 2011-11-07 13:40:45 -08:00
Eric Fischer
16364a0796 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-07 12:36:02 -08:00
Amith Yamasani
6532722306 Merge "Don't show the submit button when it isn't enabled." into ics-mr1 2011-11-07 10:57:17 -08:00