Justin Ho
47ec443ae0
am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1
...
* commit '972d12aa1e6fba69094c0a9270df645b7db74f3a':
DO NOT MERGE Revert "Increase line limit for summary text"
2012-03-19 08:11:15 -07:00
Justin Ho
972d12aa1e
Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1
2012-03-19 08:08:56 -07:00
Justin Ho
e36f86bce1
DO NOT MERGE Revert "Increase line limit for summary text"
...
This reverts commit 90e3bcae6771df767c3377ca3bd6c08d99062ca3
2012-03-17 17:09:35 -07:00
Eric Laurent
b1853f7063
am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
...
* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
MediaPlayerService: fix AudioSink latency
2012-03-16 15:01:03 -07:00
Eric Laurent
393dd03eaf
am 3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1
...
* commit '3fe7ee651db0aae9485ead227c89db1e24b9e245':
AudioTrack: relax check on minimum buffer size
2012-03-16 15:01:01 -07:00
Eric Laurent
2a0d685ed6
Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
2012-03-16 14:58:21 -07:00
Eric Laurent
3fe7ee651d
Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1
2012-03-16 14:58:07 -07:00
Amith Yamasani
31f7ef2436
am 90e3bcae: Increase line limit for summary text
...
* commit '90e3bcae6771df767c3377ca3bd6c08d99062ca3':
Increase line limit for summary text
2012-03-16 14:13:48 -07:00
Amith Yamasani
90e3bcae67
Increase line limit for summary text
...
Doing this to accomodate some really long warning text in a
checkbox widget. Needs 5 lines for English. Probably a lot
more for German, etc., so increasing it to 10 lines.
Please don't abuse that. 4 lines is still a reasonable max.
Change-Id: Ife5858f2165cb2bc046ce606f29d31010d26ecc2
2012-03-16 13:13:50 -07:00
Eric Laurent
dc63f3fe40
MediaPlayerService: fix AudioSink latency
...
The AudioSink latency is currently cached when the associated AudioTrack
is created. However, the AudioTrack latency can change if the AudioTrack is moved
from one output stream to another.
The AudioPlayer must also periodically update its view of the latency
as it is needed to compensate the real audio time used for A/V sync.
This fixes an A/V sync problem seen when switching A2DP on and off while
playing a video.
Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4
Conflicts:
media/libmediaplayerservice/MediaPlayerService.cpp
2012-03-16 12:25:31 -07:00
Eric Laurent
0df689495a
AudioTrack: relax check on minimum buffer size
...
Current AudioTrack implementation enforces that the requested audio
buffer size is at least corresponding the audio latency.
This requirement is too strong and leads to problems with current
stagefright and AudioSink implementations when playing over output
streams with long latency.
Ultimately, the AudioSink design should be changed to specify a minimum
buffer size in time or frames units but not in buffer count units.
Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f
Conflicts:
media/libmedia/AudioTrack.cpp
2012-03-16 12:22:07 -07:00
Katie McCormick
2f8b35dd88
am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1
...
* commit '2b056c6e6759d63045c22556c5418a08fcb3f80c':
Doc update: DDMS Network Traffic tool.
2012-03-16 12:11:30 -07:00
Katie McCormick
2b056c6e67
Merge "Doc update: DDMS Network Traffic tool." into ics-mr1
2012-03-16 12:09:59 -07:00
Katie McCormick
4099e17228
Doc update: DDMS Network Traffic tool.
...
Change-Id: I9aa0d94e9bdc20681ec7be3f98233223c0e742d8
2012-03-16 11:55:55 -07:00
Dianne Hackborn
df3228e561
am ce06c000: Merge "Debugging code for #6169553 : Make Phone launch faster" into ics-mr1
...
* commit 'ce06c000b4133c63414c3244c3325e25315ab179':
Debugging code for #6169553 : Make Phone launch faster
2012-03-16 11:55:00 -07:00
Dianne Hackborn
ce06c000b4
Merge "Debugging code for #6169553 : Make Phone launch faster" into ics-mr1
2012-03-16 11:53:53 -07:00
Joe Fernandez
6b16363232
am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17
...
* commit '1f60afc5cbec849054c1787bf3141d6d0d49e4c3':
docs: Emulator Hardware Acceleration docs for SDK r17
2012-03-16 10:44:50 -07:00
Joe Fernandez
1f60afc5cb
docs: Emulator Hardware Acceleration docs for SDK r17
...
Change-Id: I0714891d14db598f6c4acd29773975bd7754a912
2012-03-16 10:21:32 -07:00
Scott Main
886603da73
am eb1d42e4: Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1
...
* commit 'eb1d42e4faa34c2acf76200913920fd5ca46a39e':
docs: Fix a bunch of misc doc issues from external tracker
2012-03-15 15:56:05 -07:00
Scott Main
eb1d42e4fa
Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1
2012-03-15 15:52:56 -07:00
Dianne Hackborn
2a29b3ad13
Debugging code for #6169553 : Make Phone launch faster
...
The activity manager now has a tick when launching an app every
500ms, where it collects the current stack traces of the app if
it hasn't finished launching. These traces are included as part
of dumpstate.
This is only done on non-user builds.
Change-Id: I7f09ea00aab821ac81795f48c9d68fcca65f89fe
2012-03-15 15:48:38 -07:00
Dianne Hackborn
42ef93fcc4
am 33ace979: Merge "Remove fade animations from framework drawables." into ics-mr1
...
* commit '33ace979a452301796694ffd64506f082de42f0d':
Remove fade animations from framework drawables.
2012-03-15 11:29:22 -07:00
Dianne Hackborn
33ace979a4
Merge "Remove fade animations from framework drawables." into ics-mr1
2012-03-15 11:27:43 -07:00
Scott Main
1fbc85d32d
am f32ab914: Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that\'s not necessary" into ics-mr1
...
* commit 'f32ab914147ede0b02302a28cce6fd2f301b0b3e':
docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary
2012-03-15 10:22:35 -07:00
Scott Main
f32ab91414
Merge "docs: update various SDK and AVD Manager screenshots and remove one from the licensing doc that's not necessary" into ics-mr1
2012-03-15 10:21:00 -07:00
Robert Ly
af3701f413
am 957f716c: docs: fix toc in search au class
...
* commit '957f716cf1686145ba4c06ca8669eaa2e22f54e8':
docs: fix toc in search au class
2012-03-14 16:54:59 -07:00
Dianne Hackborn
6fdab076b7
Remove fade animations from framework drawables.
...
Change-Id: Ic4115ba779e88a405b5d2cd927db99c43def3704
2012-03-14 16:46:59 -07:00
Robert Ly
957f716cf1
docs: fix toc in search au class
...
Change-Id: I7c678a9091a5d2c7bdfcf5e104597d9c1986d5f0
2012-03-14 16:24:25 -07:00
Scott Main
1657080a0c
docs: update various SDK and AVD Manager screenshots
...
and remove one from the licensing doc that's not necessary
Change-Id: I4b07446a8fd57449dfd9b605019143f543be5e14
2012-03-14 16:16:18 -07:00
Robert Ly
363d178fac
am b285125d: Merge "docs: android u search class" into ics-mr1
...
* commit 'b285125d4bad1c76e95cd24956711deb9908c4a8':
docs: android u search class
2012-03-14 15:46:17 -07:00
Robert Ly
b285125d4b
Merge "docs: android u search class" into ics-mr1
2012-03-14 15:41:02 -07:00
Scott Main
6513bceb8e
am 7f949778: Merge "docs: remove link from GP logo" into ics-mr1
...
* commit '7f94977867ae67aa4f75d9db5de94e1233a2d7fe':
docs: remove link from GP logo
2012-03-13 23:12:09 -07:00
Scott Main
7f94977867
Merge "docs: remove link from GP logo" into ics-mr1
2012-03-13 23:09:09 -07:00
Junichi Monma
41d72c8603
Merge "DO NOT MERGE : New version of DroidSansFallback font" into ics-scoop
2012-03-13 22:48:38 -07:00
Robert Ly
055e3f25ba
docs: android u search class
...
Change-Id: I433cb5b82426c942af8f357180aeb7c947f2d9e1
2012-03-13 18:14:02 -07:00
Daniel Lehmann
aac0352871
am 0e873700: Remove the country detector logging
...
* commit '0e87370077b322b3a88c345a44c6bf3d56617071':
Remove the country detector logging
2012-03-12 18:24:41 -07:00
Daniel Lehmann
0e87370077
Remove the country detector logging
...
Bug:6156714
Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
2012-03-12 17:04:17 -07:00
Andrew Flynn
4326da7e0d
Merge "DO NOT MERGE Fix back button state issue" into ics-scoop
2012-03-12 16:00:44 -07:00
Andrew Flynn
5393525809
Merge "DO NOT MERGE" into ics-scoop
2012-03-12 16:00:36 -07:00
Wink Saville
4f50ff1ee3
am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit 'f4ae6aabbcefe39b3c85b03729c74044f02369d4':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
2012-03-12 15:53:52 -07:00
Michael Jurka
d0e46d8820
DO NOT MERGE Fix back button state issue
...
Back button / down chevron button (eg when you have an IME visible)
was not getting synced on rotation changes
Bug: 6133831
Change-Id: Iefaf3babf92898fcc87a0b14c10b037de04d84e2
2012-03-12 15:28:53 -07:00
Daniel Sandler
ea193cebef
DO NOT MERGE
...
System bar now renders the back button for recents
We used to render the back button in Recents
itself, but that had an inconsistent visual
experience.
As a part of this change, add the early beginning
of support for private status bar APIs for dimming
navigation buttons.
Bug: 3448536
Change-Id: Ie64369e3df3178178f35b56763ea96d380b6ddd4
2012-03-12 15:16:29 -07:00
Wink Saville
f4ae6aabbc
Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
Bearer Independent Protocol (BIP) connections as defined in
ETSI TS 102 223 "Smart Cards; Card Application Toolkit (CAT) (Release 11)"
need to be able to establish data connections even when not provisioned.
This can occur when trying to provision on via and EVDO network.
Bug: 6110632
Change-Id: I85722e0ba2e2606ffcf2516b8f00be6ff5271adf
2012-03-10 13:23:35 -08:00
Scott Main
161a8dec91
docs: remove link from GP logo
...
Change-Id: I6dff28e84b341054874995e78d20945e70d24cae
2012-03-09 19:12:53 -08:00
Scott Main
8edad6f16f
docs: Fix a bunch of misc doc issues from external tracker
...
Change-Id: I03cae5bdb7b806e81cc6c983a014de212cb80c73
2012-03-09 12:30:40 -08:00
Andrew Flynn
dfc87c82e4
Merge "Use a different width for nav icons in sw600dp-port." into ics-scoop
2012-03-09 11:00:14 -08:00
Andrew Flynn
1d9af30b74
Use a different width for nav icons in sw600dp-port.
...
Change-Id: I6c4024e9f60e14c072d7c01f29fabc89fc51dfb8
2012-03-08 15:56:10 -08:00
Megha Joshi
fa71583e15
am 33372b21: Merge "A few updates for TVs." into ics-mr1
...
* commit '33372b217ea5e9950560449aa5c86e0f0ddacc74':
A few updates for TVs.
2012-03-08 12:24:29 -08:00
Megha Joshi
33372b217e
Merge "A few updates for TVs." into ics-mr1
2012-03-08 12:22:49 -08:00
Megha Joshi
702d9cbc5d
am 84099f3d: Merge "Adding TV related updates." into ics-mr1
...
* commit '84099f3d788974169a8ea282f9413cb399d17012':
Adding TV related updates.
2012-03-08 12:22:05 -08:00