Justin Ho
835235a90c
Merge "Updated stat_sys wifi icons" into ics-mr0
2011-10-13 15:16:37 -07:00
Justin Ho
1723ca28e7
Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0
2011-10-13 15:16:11 -07:00
Justin Ho
1f5e23f344
Merge "Updated cut actionbar icon" into ics-mr0
2011-10-13 15:15:48 -07:00
Gilles Debunne
5bbd4f2382
Merge "Bug 5428541: Check that span is still in text before deleting"
2011-10-13 14:23:37 -07:00
Christopher Tate
143dad3938
Merge "Require device encryption password to perform adb backup/restore"
2011-10-13 14:06:22 -07:00
Mike Lockwood
9a5cb07fdd
am ab9d5b11: Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0
...
* commit 'ab9d5b11737f8a460467657035186bcfa7085eb9':
PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled.
2011-10-13 14:01:23 -07:00
Mike Lockwood
4f63d0ef62
Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0
2011-10-13 13:59:33 -07:00
Scott Main
8632bf0a94
am e89b6969: Merge "docs: add toc to emulator doc and a few cross-links" into ics-mr0
...
* commit 'e89b69691f6593d4287dd1d02c5d31561f6d4aa8':
docs: add toc to emulator doc and a few cross-links
2011-10-13 13:48:02 -07:00
Scott Main
a6a6f178a2
Merge "docs: add toc to emulator doc and a few cross-links" into ics-mr0
2011-10-13 13:46:23 -07:00
Adam Cohen
4d9f0a05e5
am c408a5d5: Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0
...
* commit 'c408a5d5738c84160a7e9a8299c953ea638bcef4':
Fixing issue where widgets file was getting blown away, issue: 5036321
2011-10-13 13:40:01 -07:00
Adam Cohen
a80068a6cd
Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0
2011-10-13 13:38:00 -07:00
Robert Ly
418e6490fc
am b14b2c25: Merge "docs: tools and adt md5sum and file sizes" into ics-mr0
...
* commit 'b14b2c25c20f77f7de0fd8b8fe59684a02add85f':
docs: tools and adt md5sum and file sizes
2011-10-13 13:21:53 -07:00
Robert Ly
985d09db7e
Merge "docs: tools and adt md5sum and file sizes" into ics-mr0
2011-10-13 13:20:08 -07:00
Dianne Hackborn
75c5b1fd51
am 97175bc3: Merge "Fix issue #5446988 : WindowManager warns BOOT TIMEOUT,..." into ics-mr0
...
* commit '97175bc3277055047d4c3e6109824065f2abec5d':
Fix issue #5446988 : WindowManager warns BOOT TIMEOUT,...
2011-10-13 13:14:43 -07:00
Dianne Hackborn
8ab2a5b6ea
Merge "Fix issue #5446988 : WindowManager warns BOOT TIMEOUT,..." into ics-mr0
2011-10-13 13:13:20 -07:00
Adam Powell
56522c605f
am aa79a5d5: Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0
...
* commit 'aa79a5d5a3b06b5b4e40a1ab0ccc6697627b1a8d':
Fix bug 5455676 - seek bars without thumbs
2011-10-13 13:12:42 -07:00
Brian Colonna
2e0dff81fb
am 534b7af0: Merge "Fix 5437700: Underlying backup method was exposed" into ics-mr0
...
* commit '534b7af02782bdd36b96c6b83dfa7213d94b88c9':
Fix 5437700: Underlying backup method was exposed
2011-10-13 13:10:42 -07:00
Adam Powell
129220fd96
Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0
2011-10-13 13:10:14 -07:00
Brian Colonna
2845336362
Merge "Fix 5437700: Underlying backup method was exposed" into ics-mr0
2011-10-13 13:07:55 -07:00
Daniel Sandler
a3e7ecf224
am dba93565: Break apart DISABLE_HOME and DISABLE_RECENT.
...
* commit 'dba935659024a9ca83cb6bd3f1a9970e277f7658':
Break apart DISABLE_HOME and DISABLE_RECENT.
2011-10-13 12:38:00 -07:00
Andreas Huber
fe86aeefba
Merge "NuPlayer is now taking on the task of streaming over RTSP."
2011-10-13 12:13:57 -07:00
Fred Quintana
e607bea591
am 2984971d: Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely" into ics-mr0
...
* commit '2984971db306b70aab41e5d10b5e1e86b6ed5b29':
reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely
2011-10-13 11:43:10 -07:00
Jason Sams
71ba9f200a
Merge "Start adding simple performance tests for RS compute."
2011-10-13 11:43:03 -07:00
Fred Quintana
8b533e7bd6
Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely" into ics-mr0
2011-10-13 11:41:19 -07:00
Daniel Sandler
e911416078
am 1000e3fa: (-s ours) Merge "Stop enabling all disabled status bar features from GlobalActions. (DO NOT MERGE)" into ics-mr0
...
* commit '1000e3fa06d1d560a6e790730fa351c497bb2a0e':
Stop enabling all disabled status bar features from GlobalActions. (DO NOT MERGE)
2011-10-13 10:53:14 -07:00
Adam Skory
95ce620cc4
Merge "Fixing typo on fragments page."
2011-10-13 10:52:18 -07:00
Daniel Sandler
742b029ad6
Merge "Stop enabling all disabled status bar features from GlobalActions. (DO NOT MERGE)" into ics-mr0
2011-10-13 10:51:19 -07:00
Ben Murdoch
fa9835eaa9
Merge "Don't redraw when not scrolling, even if finger is held down."
2011-10-13 10:17:57 -07:00
Andreas Huber
b3721d3931
Merge "Support for an MPEG2 Program Stream extractor."
2011-10-13 10:03:26 -07:00
Mangesh Ghiware
e9de59c75f
am a6708c6a: Merge "Add setting for configuring zoom level on double-tap." into ics-mr0
...
* commit 'a6708c6a462d2a30e51e7ded2559a4054cb651fc':
Add setting for configuring zoom level on double-tap.
2011-10-13 09:19:20 -07:00
Mangesh Ghiware
35e8259f7b
Merge "Add setting for configuring zoom level on double-tap." into ics-mr0
2011-10-13 09:17:10 -07:00
Mike Lockwood
adb621c046
am 0c265c88: Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0
...
* commit '0c265c886b563095172827d39b55a8cd71a19ffb':
MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size
2011-10-13 08:56:49 -07:00
Mike Lockwood
db86dfe416
Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0
2011-10-13 08:55:04 -07:00
Justin Ho
e70837e6b2
am 48cf582d: Merge "Volume overlay right padding increased" into ics-mr0
...
* commit '48cf582df3bb81afae36314c187f909486c47c55':
Volume overlay right padding increased
2011-10-13 07:36:09 -07:00
Justin Ho
75556227da
Merge "Volume overlay right padding increased" into ics-mr0
2011-10-13 07:32:32 -07:00
The Android Open Source Project
78bb9e60cb
Reconcile with ics-mr0-release
...
Change-Id: I326384d8f33fbf4aceaf34331983727fd6bf256f
2011-10-13 07:04:51 -07:00
The Android Automerger
eba718fbe6
merge in ics-mr0-release history after reset to ics-mr0
2011-10-13 06:28:07 -07:00
Wu-cheng Li
b83613774f
am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0
...
* commit '514a6cfb7f7085b266f457155ff63373d2dff8ee':
Improve camera javadoc and fix some errors.
2011-10-12 23:36:14 -07:00
Wu-cheng Li
eb28cf6737
Merge "Improve camera javadoc and fix some errors." into ics-mr0
2011-10-12 23:34:01 -07:00
Jeff Brown
3e2fb7056a
Deprecate local-only CursorWindows.
...
There is no difference and has never really been a difference
between local-only and remotable CursorWindows. By removing the
distinction officially in the API, we will make it easier to
implement CrossProcessCursor correctly. CrossProcessCursor
is problematic currently because it's not clear whether a call
to getWindow() will return a local-only window or a remotable window.
As a result, the bulk cursor adaptor has special case handling
for AbstractWindowedCursors vs. ordinary CrossProcessCursors
so that it can set a remotable window before the cursor fills it.
All these problems go away if we just forget about local-only
windows being special in any way.
Change-Id: Ie59f517968e33d0ecb239c3c4f60206495e8f376
2011-10-12 22:19:41 -07:00
Scott Main
2e55b7998a
am 8da11914: cherrypick from hc-mr2 Change-Id: I76de309e70026720d30772ff5b428f7aefc8de4c docs: add docs about "screenSize" configuration changes
...
* commit '8da119148fb8c20ec49917a6c106a0f731227238':
cherrypick from hc-mr2 Change-Id: I76de309e70026720d30772ff5b428f7aefc8de4c docs: add docs about "screenSize" configuration changes
2011-10-12 20:58:09 -07:00
Brian Colonna
115238f1fe
am 63c8a47b: Merge "Fixes 5446301" into ics-mr0
...
* commit '63c8a47b7fb8244e8ee9fbcf40a77a30a9c98ca9':
Fixes 5446301
2011-10-12 19:15:48 -07:00
Brian Colonna
980433a36e
Merge "Fixes 5446301" into ics-mr0
2011-10-12 19:14:03 -07:00
Jim Miller
1493cfe9f5
am 207c6731: Merge "Fix 5444675: Fix vibrate regression on Pattern and PIN unlock screens." into ics-mr0
...
* commit '207c67315c8668b72cbb7bd370f1d6c8479eabd4':
Fix 5444675: Fix vibrate regression on Pattern and PIN unlock screens.
2011-10-12 18:52:06 -07:00
Jim Miller
e0e19cea9e
Merge "Fix 5444675: Fix vibrate regression on Pattern and PIN unlock screens." into ics-mr0
2011-10-12 18:49:25 -07:00
Jamie Gennis
c901ca0abc
Surface: fix a protected buffer test
...
This change renames the ScreenshotsOfProtectedBuffersFail to
ScreenshotsOfProtectedBuffersSucceed and changes the test to verify that
the screenshot succeeds.
Change-Id: I960bb8eed4211578cb4dc446b08392937da064b6
2011-10-12 18:42:33 -07:00
Jason Sams
6af6ddb4d7
Merge "Fix bug with 1D arrays and threading. Some elements got launched multiple times."
2011-10-12 18:36:58 -07:00
Daniel Lehmann
dd98dfa0f5
am cc21cc01: Merge "Allow clearing out the source bounds" into ics-mr0
...
* commit 'cc21cc017ba02338a78eca00af6a1a0d3f7ce5bf':
Allow clearing out the source bounds
2011-10-12 18:18:08 -07:00
Daniel Lehmann
13450de0f5
Merge "Allow clearing out the source bounds" into ics-mr0
2011-10-12 18:16:15 -07:00
Wink Saville
9628ac81f4
am 2e6c3329: Merge "Set roaming indicator to off if Perferred Roaming List is not loaded." into ics-mr0
...
* commit '2e6c332962fb0f64ad65cda3b798c744e0124ad9':
Set roaming indicator to off if Perferred Roaming List is not loaded.
2011-10-12 18:16:08 -07:00