James Dong
561a81f7e0
Merge "Use setVideoSize API in StagefrightRecorder"
2010-10-05 19:01:10 -07:00
Romain Guy
9a6036cede
Merge "Optimize saveLayer() when the clip flag is set."
2010-10-05 18:16:35 -07:00
Dianne Hackborn
c451801a5f
Merge "Implement permission granting in clipboard."
2010-10-05 17:54:35 -07:00
Vasu Nori
dc6783c386
Merge "fix broken build"
2010-10-05 17:46:36 -07:00
Vasu Nori
b84dd97414
Merge "annotate some tests large - just in case they take longer. bug:3066136"
2010-10-05 17:08:53 -07:00
Kenny Root
8c4edc02d5
am bfa33b94: am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread
...
Merge commit 'bfa33b9484e2c0a019ab81f30261b9696df23a9b'
* commit 'bfa33b9484e2c0a019ab81f30261b9696df23a9b':
Use pread() in ZipFileRO for Linux
2010-10-05 17:02:42 -07:00
Gilles Debunne
7a2351cd9e
am b3e95d9f: am c37eac24: Restored ic_dialog_menu_generic asset.
...
Merge commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800'
* commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800':
Restored ic_dialog_menu_generic asset.
2010-10-05 17:02:27 -07:00
Vasu Nori
096bd77bb4
Merge "turn off some useless messages"
2010-10-05 16:53:24 -07:00
Vasu Nori
91abfdd3ed
turn off some useless messages
...
Change-Id: I5ed5696cd052b70e7cf7b872205470cd56fada90
2010-10-05 16:50:51 -07:00
Gilles Debunne
58fc739c75
am 8556efe5: (-s ours) am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
...
Merge commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920'
* commit '8556efe5a34d8fc6ed99f1fdae60fa41b7647920':
DO NOT MERGE. Select word no longer selects spaces between words.
2010-10-05 16:16:20 -07:00
Scott Main
f29cde6dc0
am 196894cd: am c692792e: am 46ffeb21: docs: update homepage with more countries for market announcement
...
Merge commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f'
* commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f':
docs: update homepage with more countries for market announcement
2010-10-05 16:15:44 -07:00
Alex Sakhartchouk
c8a831e113
Merge "Adding average fps counter. Removing rsLight from libRS"
2010-10-05 15:32:38 -07:00
Chet Haase
a0ac582a72
Merge "Adding next/prev to fragment animations and to PreferenceActivity"
2010-10-05 15:21:34 -07:00
Scott Main
951c3c283c
Merge "docs: Rewrite of App Fundamentals.. Part 1. This introduces two new docs: Activities Provides a fundamental introduction to how activities work, including the basics about layout, manifest entries, starting activies, getting results, and the complete discussion about the lifecycle (which used to be in the fundamentals.jd document under "Component Lifecycles"), but also now includes more information about saving instance state (with new diagrams). Tasks and Back Stack A large expansion of the material originally presented in the fundamentals.jd document under "Activities and Tasks". This doc talks all about how tasks and the back stack work. This content re-organization is important because fragments can now become a part of the back stack (which is a task-oriented concept), thus, it's important to separate the task ideas from being tied directly to activities only, which is how tasks are currently discussed. However, fragments are not yet discussed here in detail---that will come later when the fragment dev guide is introduced."
2010-10-05 15:19:27 -07:00
Scott Main
dc7921f533
am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
...
Merge commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d'
* commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-05 15:17:40 -07:00
James Dong
bc16dbc810
am 6a02ba01: am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
...
Merge commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db'
* commit '6a02ba0100e030e0b8bf2b6f195eabac1f1812db':
Resilent media time stamp adjustment
2010-10-05 15:17:29 -07:00
Gilles Debunne
1f9f022c07
am 6f4f0106: am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread
...
Merge commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4'
* commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4':
Removed icon in Alert dialog header.
2010-10-05 15:17:17 -07:00
Adam Powell
d15e65f683
am dcbf315e: am 368733b2: Remove overscroll_edge.png from drawable/
...
Merge commit 'dcbf315e83234623622bd268a823ecc4dc49e375'
* commit 'dcbf315e83234623622bd268a823ecc4dc49e375':
Remove overscroll_edge.png from drawable/
2010-10-05 15:17:05 -07:00
Adam Powell
11d97cc012
am b8d3bc5c: (-s ours) am 103f59ba: Merge "Fix bug 3052686 - ScrollView padding treated incorrectly" into gingerbread
...
Merge commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669'
* commit 'b8d3bc5c3c65bbf71a6aa3f8345db024a4ba0669':
Fix bug 3052686 - ScrollView padding treated incorrectly
2010-10-05 15:16:48 -07:00
Romain Guy
6b391886cf
Merge "Add support for paletted textures."
2010-10-05 15:00:01 -07:00
Romain Guy
5f1077a214
Merge "Code cleanup and disable display lists for now."
2010-10-05 13:44:24 -07:00
Christopher Tate
936b72238f
Merge "Make View.DragThumbnailBuilder a static class"
2010-10-05 13:43:44 -07:00
Jason Sams
f45cac1a15
Merge "Implement allocation resizing."
2010-10-05 13:35:47 -07:00
Alex Sakhartchouk
5213e80eac
Merge "Adding text metrics to renderscript."
2010-10-05 13:13:40 -07:00
Dianne Hackborn
a8d3f7b976
am 89230e3b: am 458fc5f5: Merge "Fix issue #3041660 : Camera image flips upside down when rotating device" into gingerbread
...
Merge commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d'
* commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d':
Fix issue #3041660 : Camera image flips upside down when rotating device
2010-10-05 12:54:41 -07:00
Vasu Nori
c480e1c793
Merge "STOPSHIP - add illegalStateException to catch potential deadlocks in db"
2010-10-05 12:27:27 -07:00
Gilles Debunne
4103016bfe
Merge "resolved conflicts for merge of 8390651c to master"
2010-10-05 12:26:22 -07:00
Gilles Debunne
bcaeac176f
resolved conflicts for merge of 8390651c to master
...
Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa
2010-10-05 12:11:56 -07:00
Ficus Kirkpatrick
536c9e26af
Merge "Reduce log spam."
2010-10-05 11:33:03 -07:00
Joe Onorato
f8649200d4
manual merge Merge commit '77e42376' into work
...
Conflicts:
packages/SystemUI/res/values/colors.xml
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e
2010-10-05 12:37:03 -04:00
Christopher Tate
6997079565
Merge "Refinements to drag/drop"
2010-10-04 19:40:28 -07:00
Gil Dobjanschi
c9c5e224bc
Merge "Added mute APIs for MediaVideoItem and AudioTrack"
2010-10-04 19:04:36 -07:00
Scott Main
cfb1390dcb
resolved conflicts for merge of 7008b7c1 to master
...
Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e
2010-10-04 18:42:49 -07:00
Patrick Dubroy
43f32e7583
am 242fa52b: am eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
...
Merge commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270'
* commit '242fa52bb6d4556c7cb4bcb1880210f076ea7270':
Fix 2-pixel offset unlock jog tab
2010-10-04 18:23:44 -07:00
Gil Dobjanschi
03ce5e9a82
Merge "Save AudioTrack to XML"
2010-10-04 17:52:43 -07:00
Romain Guy
5a9be87d7d
Merge "Remove logs to reduce logcat spam."
2010-10-04 17:24:21 -07:00
Chet Haase
d6fae037b8
Merge "Changed LayoutTransition to disable animations when set to null"
2010-10-04 17:16:03 -07:00
Romain Guy
fea26a72f1
Merge "Reorder logs."
2010-10-04 17:15:15 -07:00
Kenny Root
2a877ed73a
am f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread
...
Merge commit 'f84a5918f5e0572c0280fa705970ef7459b45393' into gingerbread-plus-aosp
* commit 'f84a5918f5e0572c0280fa705970ef7459b45393':
Use pread() in ZipFileRO for Linux
2010-10-04 17:12:10 -07:00
Kenny Root
085996210c
Merge "Use pread() in ZipFileRO for Linux" into gingerbread
2010-10-04 17:08:26 -07:00
Gilles Debunne
64e8d24969
am c37eac24: Restored ic_dialog_menu_generic asset.
...
Merge commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5' into gingerbread-plus-aosp
* commit 'c37eac249719a8f930cb2b9d3c5bdee591018cc5':
Restored ic_dialog_menu_generic asset.
2010-10-04 17:03:25 -07:00
Gilles Debunne
6ce2e6e4bc
am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
...
Merge commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee' into gingerbread-plus-aosp
* commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee':
DO NOT MERGE. Select word no longer selects spaces between words.
2010-10-04 16:45:32 -07:00
Gilles Debunne
250b2c9c16
Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
2010-10-04 16:42:40 -07:00
Scott Main
39aac03b9b
am c692792e: am 46ffeb21: docs: update homepage with more countries for market announcement
...
Merge commit 'c692792ead7dab0a41181f4589c1d8d249d0ad88' into gingerbread-plus-aosp
* commit 'c692792ead7dab0a41181f4589c1d8d249d0ad88':
docs: update homepage with more countries for market announcement
2010-10-04 16:35:18 -07:00
Scott Main
37c5dc049c
am 46ffeb21: docs: update homepage with more countries for market announcement
...
Merge commit '46ffeb218859a543540a70b3229a48d2d96cbb4a' into gingerbread
* commit '46ffeb218859a543540a70b3229a48d2d96cbb4a':
docs: update homepage with more countries for market announcement
2010-10-04 16:31:47 -07:00
Gilles Debunne
ff5e2fddb3
Merge "resolved conflicts for merge of 242fa52b to master"
2010-10-04 16:01:22 -07:00
Gil Dobjanschi
5110891a53
Merge "Added audio track playback API"
2010-10-04 15:49:26 -07:00
Scott Main
0f77061f38
am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
...
Merge commit 'b3a5b85a612703e54e631ffab5bb518eba909899' into gingerbread-plus-aosp
* commit 'b3a5b85a612703e54e631ffab5bb518eba909899':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-04 15:49:07 -07:00
James Dong
90c9df0582
am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
...
Merge commit 'b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp
* commit 'b99f0c7eae365f788a21944fef28de580c7f5f92':
Resilent media time stamp adjustment
2010-10-04 15:48:59 -07:00
Gilles Debunne
efb078ff61
am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread
...
Merge commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b' into gingerbread-plus-aosp
* commit 'b621e2030d86356af6e8f37e9aed339a5f2ea52b':
Removed icon in Alert dialog header.
2010-10-04 15:48:54 -07:00