Kenny Root
f39fc5a881
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
2012-01-13 13:11:02 -08:00
Dianne Hackborn
6393739ea4
Merge "Fix issue #5823276 : home repaints after full-screen app is exited" into ics-mr1
2012-01-13 12:56:40 -08:00
Bart Sears
0667548a8a
Merge "Update to latest version of Roboto" into ics-mr1
2012-01-13 12:32:43 -08:00
Christopher Tate
cab5000317
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
2012-01-13 11:49:20 -08:00
John Huang
f5114c03de
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
2012-01-13 11:37:15 -08:00
Robert Ly
c61fa6848c
Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1
2012-01-13 10:13:14 -08:00
Scott Main
8e9e63253e
Merge "docs: make AD logo clickable on home page" into ics-mr1
2012-01-12 15:44:53 -08:00
Chia-chi Yeh
41e18e335b
Merge "VPN: silence VPN notifications." into ics-mr1
2012-01-12 14:24:30 -08:00
Roman Nurik
be0ede7010
Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
2012-01-12 12:45:00 -08:00
Jim Miller
32bfab04c4
Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1
2012-01-12 12:28:59 -08:00
Daniel Sandler
6d810d88f8
Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1
2012-01-12 11:38:39 -08:00
Matthew Xie
82ba232b50
Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1
2012-01-12 11:24:06 -08:00
Scott Main
dab211a8d5
Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1
2012-01-12 11:22:24 -08:00
Scott Main
0775fc7f0c
Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1
2012-01-12 11:19:08 -08:00
Robert Greenwalt
f0ece48909
Merge "Disable wimax when mobile data is in Settings" into ics-mr1
2012-01-12 09:24:45 -08:00
Danielle Millett
178c4fbfe2
Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1
2012-01-12 07:28:24 -08:00
Brian Colonna
41e7472dad
Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1
2012-01-12 06:33:49 -08:00
Xia Wang
50bf48027e
Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1
2012-01-11 17:52:06 -08:00
Xia Wang
db412c81a9
Merge "Get average value for image processing test bug#: 5566079" into ics-mr1
2012-01-11 17:51:48 -08:00
Katie McCormick
698d442697
Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1
2012-01-11 16:40:37 -08:00
Selim Gurun
d99d96e3dc
Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
2012-01-11 14:18:14 -08:00
Eric Laurent
85ed73d287
Merge "stagefright: limit audio gap for looped playback" into ics-mr1
2012-01-11 11:10:38 -08:00
Scott Main
93e7348d94
Merge "docs: add links to Android Design from dev docs" into ics-mr1
2012-01-10 17:08:19 -08:00
Roman Nurik
0dc1f704b2
Merge "Android Design" into ics-mr1
2012-01-10 17:01:45 -08:00
Scott Main
5fbad363f1
Merge "docs: fix broken links in .jd docs" into ics-mr1
2012-01-10 12:53:42 -08:00
Jim Miller
2f6fcb2893
Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
2012-01-10 10:28:21 -08:00
Pin Ting
98f6fa54ac
Merge "Fixes typo." into ics-mr1
2012-01-09 18:58:13 -08:00
Dianne Hackborn
ee9e2be00e
Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1
2012-01-09 16:47:35 -08:00
Eino-Ville Talvala
456a9c2dc5
Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
2012-01-06 15:46:36 -08:00
Bart Sears
4dc1cbe06f
Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
2012-01-06 15:45:13 -08:00
Wink Saville
8676933648
Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
2012-01-06 14:27:56 -08:00
Fabrice Di Meglio
9735559b6d
Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
2012-01-06 14:19:20 -08:00
Justin Ho
52b68583c8
Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
2012-01-06 14:07:51 -08:00
Justin Ho
2e296aeed7
Merge "Updating default image wallpaper for tablet." into ics-mr1
2012-01-06 14:07:37 -08:00
Scott Main
55ec71116f
Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
...
* changes:
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
2012-01-05 09:42:52 -08:00
Wink Saville
103a6ff9ce
Merge "Enhancement on ICS data stall polling logic" into ics-mr1
2012-01-04 13:53:25 -08:00
Wink Saville
4ee6427cc5
Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
2012-01-04 13:50:04 -08:00
Wink Saville
624eef24dc
Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
2012-01-04 13:47:55 -08:00
Bart Sears
66577b602c
Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
2012-01-04 13:47:09 -08:00
Eric Laurent
11cb4c04a3
Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
2012-01-04 12:58:17 -08:00
Christopher Tate
1e2efa6270
Merge "Tweak docs on 'adb logcat'" into ics-mr1
2012-01-03 17:38:51 -08:00
Joe Fernandez
5c907fd862
Merge "docs: Add developer guide cross-references, Project ACRE, round 4" into ics-mr1
2011-12-22 15:55:00 -08:00
Roman Nurik
3cae86d9e1
Merge "docs: Update App Widgets dev guide size discussion" into ics-mr1
2011-12-22 14:27:55 -08:00
John Wang
6e52b21f09
Merge "Hide emergency call text if not support it." into ics-mr1
2011-12-20 10:41:08 -08:00
Roman Nurik
a4c0530828
am 00697a90: docs: Add missing intent flag to Android U nav class
...
* commit '00697a90bec4e0536cfa0873602b64bb6785022e':
docs: Add missing intent flag to Android U nav class
2011-12-16 12:05:32 -08:00
Justin Ho
fe7a2124ae
Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
2011-12-16 11:52:08 -08:00
Alexander Lucas
a02222af29
Merge "Fixed table labelling issues in 'Multiple Dimensions' multiple apk lesson" into ics-mr1
2011-12-16 11:38:05 -08:00
Scott Main
c144f4e74a
Merge "docs: fix whitespace in sidenav" into ics-mr1
2011-12-16 11:30:00 -08:00
Roman Nurik
487f720b2b
am eb946fbd: Merge "docs: Minor link fix in Android U class" into ics-mr0
...
* commit 'eb946fbdc800d56e1cbac515a1c73de806e74711':
docs: Minor link fix in Android U class
2011-12-16 11:23:27 -08:00
Roman Nurik
ff2cb33d88
Merge "docs: Minor link fix in Android U class" into ics-mr0
2011-12-16 11:21:59 -08:00
