Scott Main
|
6742e16ef2
|
Merge "adding Android Beam sample"
|
2011-10-04 17:09:38 -07:00 |
|
Dave Santoro
|
8d6e66d910
|
Merge "Fix permission strings to match ICS-FactoryROM."
|
2011-10-04 16:19:27 -07:00 |
|
Christopher Tate
|
bb7a593bf7
|
Merge "Add -nosystem flag to adb backup"
|
2011-10-04 16:16:11 -07:00 |
|
Jason Sams
|
f2ccbfb4af
|
Merge "Fix crash running old HC apps."
|
2011-10-04 15:53:37 -07:00 |
|
Dave Santoro
|
d31a2f7c8b
|
am 7d535138: (-s ours) DO NOT MERGE New permissions for social stream.
* commit '7d535138c15b3e9f90432fb942f9027fa334b681':
DO NOT MERGE New permissions for social stream.
|
2011-10-04 15:48:22 -07:00 |
|
Dave Santoro
|
838e7b857a
|
Merge "Add new permissions for read/write social stream."
|
2011-10-04 15:46:10 -07:00 |
|
Ben Komalo
|
517eeff029
|
Merge "New PIN unlock screen layout."
|
2011-10-04 14:27:24 -07:00 |
|
Joe Fernandez
|
9dea72b0b4
|
Merge "docs: add developer guide cross-references, Project ACRE"
|
2011-10-04 14:03:12 -07:00 |
|
Michael Jurka
|
18ae21fc8c
|
Merge "Reduce height of recent app thumbnails"
|
2011-10-04 14:01:08 -07:00 |
|
The Android Open Source Project
|
5c5e7fac71
|
Reconcile with ics-factoryrom-release
Change-Id: I35a78040547d4f13dcf96639a229b0b64a18bbf8
|
2011-10-04 13:56:58 -07:00 |
|
Jeff Sharkey
|
df35943d11
|
Merge "Read iface stats from single proc file."
|
2011-10-04 13:52:24 -07:00 |
|
Danielle Millett
|
9a885ed043
|
Merge "Fix 5405210: DevicePolicyManager doesn't allow Face Unlock"
|
2011-10-04 13:23:55 -07:00 |
|
Jeff Sharkey
|
676ffda2e5
|
Merge "Track xtables summary, move tether stats, time."
|
2011-10-04 13:12:06 -07:00 |
|
Amith Yamasani
|
f20850c94e
|
Merge "Tie the lockscreen sounds with the ringer volume."
|
2011-10-04 13:02:31 -07:00 |
|
Irfan Sheriff
|
533367582f
|
Merge "Reduce/Fix system logging"
|
2011-10-04 12:13:27 -07:00 |
|
Gilles Debunne
|
b2bce00b0a
|
Merge "5402566: Copy/cut icons do not appear if the text is Japanese only"
|
2011-10-04 10:51:13 -07:00 |
|
Gilles Debunne
|
10afdff9ff
|
Merge "Optimisations and bugs in SpellChecker"
|
2011-10-04 10:50:54 -07:00 |
|
Matthew Xie
|
f870117435
|
Merge "Send TURN_HOT message to the state machine from BluetoothService after it starts"
|
2011-10-04 10:21:37 -07:00 |
|
Kenny Root
|
5166e2713a
|
Merge "Add explicit mimetype for verifier calls"
|
2011-10-04 09:04:06 -07:00 |
|
Alon Albert
|
fe89309692
|
Merge "Update dumpsys output"
|
2011-10-04 08:39:46 -07:00 |
|
The Android Automerger
|
ee8b7c13ec
|
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
2011-10-04 06:28:35 -07:00 |
|
Flavio Lerda
|
a330f4edb3
|
Merge "Add a cached formatted phone number to call log."
|
2011-10-04 02:24:28 -07:00 |
|
Jim Miller
|
48feb85c1b
|
Merge "Fix 5185505: allow facelock to be enabled by a setting."
|
2011-10-03 22:00:03 -07:00 |
|
Dianne Hackborn
|
7746cc3188
|
Fix handling of "allow fds" state.
Didn't take into account nesting of bundles. Boo.
Change-Id: Ic8cf21ad8d6f4938a3e105128624c9d162310d01
|
2011-10-03 21:09:35 -07:00 |
|
Svetoslav Ganov
|
a0ac77133d
|
Merge "The logic for not populating text to some accessibility events is scattered."
|
2011-10-03 18:33:32 -07:00 |
|
Jeff Brown
|
d16d4f869d
|
Merge "Transfer large bitmaps using ashmem. Bug: 5224703"
|
2011-10-03 18:27:51 -07:00 |
|
Svetoslav Ganov
|
dd5707564e
|
Merge "Accessibility services cannot obtain the source of an event coming from a root namespace descendant."
|
2011-10-03 17:43:39 -07:00 |
|
Danielle Millett
|
6995e63b5b
|
Merge "Reworked biometric weak check functions"
|
2011-10-03 17:38:47 -07:00 |
|
Jeff Brown
|
5707dbf15d
|
Transfer large bitmaps using ashmem.
Bug: 5224703
Change-Id: If385a66adf4c6179a0bb49c0e6d09a9567e23808
|
2011-10-03 17:28:13 -07:00 |
|
Dianne Hackborn
|
16624bd4fe
|
Merge "Add mechanism for Parcel to not allow FDs to be written to it."
|
2011-10-03 17:13:54 -07:00 |
|
Justin Ho
|
eb53548f9a
|
Resolve conflicts for merge 121e805a to master
Conflicts:
CleanSpec.mk
Change-Id: I750218dbd78e15c1ae3324b3bcfbcd28a4da2676
|
2011-10-03 17:06:26 -07:00 |
|
Dianne Hackborn
|
8938ed2c8e
|
Add mechanism for Parcel to not allow FDs to be written to it.
This is to help implement issue #5224703.
Change-Id: I026a5890495537d15b57fe61227a640aac806d46
|
2011-10-03 16:58:41 -07:00 |
|
Adam Powell
|
a030b2ba7c
|
Merge "Don't obtain attributes for the whole theme when looking for selection mode drawables."
|
2011-10-03 16:57:05 -07:00 |
|
Justin Ho
|
e7bbe54012
|
Merge "Adding additional variety to sound set 7" into ics-factoryrom
|
2011-10-03 16:49:58 -07:00 |
|
Scott Main
|
c407be6ef8
|
Merge "docs: remove gerunds from UI dev guides and resolve linkbacks"
|
2011-10-03 16:06:47 -07:00 |
|
Scott Main
|
741a3cc86d
|
Merge "docs: fix a bug in the search results in which clicking a sorting tab does not open that tab until you click a tab again. This occured due to the order of events being out of order in terms of when we invoke the click() on a tab based on the search being invoked. I'm pretty sure this worked fine before, so I think this might have been introduced by a behavior change in CSE. The fix is to simply invoke the click() for a tab when the respective search results actually return using an additional callback."
|
2011-10-03 15:44:50 -07:00 |
|
Justin Ho
|
6c3613a559
|
Merge "allow override of HDMI rotation"
|
2011-10-03 15:32:14 -07:00 |
|
John Reck
|
459d518d35
|
Merge "Hardware accelerated button focus rings"
|
2011-10-03 15:01:10 -07:00 |
|
The Android Automerger
|
1bc0ac0d8a
|
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
2011-10-03 14:53:50 -07:00 |
|
Irfan Sheriff
|
d6f3f2439c
|
Merge "Remember wifi disable due to airplane"
|
2011-10-03 13:53:42 -07:00 |
|
Adam Powell
|
e035a0fd29
|
Merge "Fix bugs around overlay action modes."
|
2011-10-03 13:32:47 -07:00 |
|
Gilles Debunne
|
d6506eb738
|
Merge "Bug 5327547: re-check word after it (may) have been added to user dictionary."
|
2011-10-03 12:58:52 -07:00 |
|
Gilles Debunne
|
4ed5e76bcc
|
Merge "Bug 5384674: When only one suggestion is returned, it is displayed twice"
|
2011-10-03 12:58:42 -07:00 |
|
Gilles Debunne
|
c94887b842
|
Merge "New underline color for the Voice recognized suggestions"
|
2011-10-03 12:58:34 -07:00 |
|
Scott Main
|
ec8b1a3166
|
Merge "docs: fix wacky markup bug caused by lack of sentence terminator"
|
2011-10-03 12:19:55 -07:00 |
|
Svetoslav Ganov
|
da976c73b2
|
Merge "Adding accessibility support to the share UI."
|
2011-10-03 11:53:48 -07:00 |
|
Daniel Sandler
|
cf76344be5
|
Merge "Slightly less ugly ICS adb icons."
|
2011-10-03 11:30:10 -07:00 |
|
Russell Brenner
|
2bc2a9dc38
|
Merge "Center box text vertically"
|
2011-10-03 11:29:16 -07:00 |
|
Daniel Sandler
|
beae029386
|
Merge "Fix contentDescriptions in status bar."
|
2011-10-03 11:08:52 -07:00 |
|
Xavier Ducrohet
|
22b27f006b
|
am 6c465bbe: (-s ours) Cherry-pick f1dee1 from master for SDK. do not merge.
* commit '6c465bbe805354dc0101d2cac1d7ce374bb336a0':
Cherry-pick f1dee1 from master for SDK. do not merge.
|
2011-10-03 10:43:49 -07:00 |
|