59748 Commits

Author SHA1 Message Date
Gilles Debunne
cbdd245793 Merge "Bug 5428541: Check that span is still in text before deleting" 2011-10-13 14:23:37 -07:00
Christopher Tate
28e9046ed4 Merge "Require device encryption password to perform adb backup/restore" 2011-10-13 14:06:22 -07:00
Mike Lockwood
6982847062 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
ab9d5b1173 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
3f7e26601a 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
e89b69691f 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
1bbb92deed 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
c408a5d573 Merge "Fixing issue where widgets file was getting blown away, issue: 5036321" into ics-mr0 2011-10-13 13:38:00 -07:00
Mike Lockwood
5dca30affc PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled.
Bug: 5426212

Change-Id: Iebe51609233ef17c108bbec680369793abbae1be
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-13 16:29:29 -04:00
Robert Ly
2bc97f70f3 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
b14b2c25c2 Merge "docs: tools and adt md5sum and file sizes" into ics-mr0 2011-10-13 13:20:08 -07:00
Dianne Hackborn
7fdf356837 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
97175bc327 Merge "Fix issue #5446988: WindowManager warns BOOT TIMEOUT,..." into ics-mr0 2011-10-13 13:13:20 -07:00
Adam Powell
9e45b78c4e 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
7327b8a806 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
aa79a5d5a3 Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0 2011-10-13 13:10:14 -07:00
Brian Colonna
534b7af027 Merge "Fix 5437700: Underlying backup method was exposed" into ics-mr0 2011-10-13 13:07:55 -07:00
Dianne Hackborn
38cc8960cb Fix issue #5446988: WindowManager warns BOOT TIMEOUT,...
...dev.bootcomplete flags is set before boot animation is out

Also:

- Fix crash in recent apps if the intent for an old app didn't
happen to have the new task flag set.
- Fix issue where a crash in system UI would cause the crash
dialog to be displayed below it, effectively locking the UI.  Now
the crash dialog for persistent processes is shown above everything
else.

Change-Id: I0312001a92beeae5f644c7c3e5c5e19f6716df36
2011-10-13 12:55:57 -07:00
Daniel Sandler
8c05abf157 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
Christopher Tate
32418be49e Require device encryption password to perform adb backup/restore
This supersedes any backup-password that the user might supply.  Per
design, the device encryption password is also always used to encrypt
the backup archive.

The CL introduces two new strings, used for prompting the user for
their device encryption password rather than their settings-defined
"backup password" when confirming a full backup or restore operation.

Bug 5382487

Change-Id: I0b03881b45437c944eaf636b6209278e1bba7a9f
2011-10-13 12:29:32 -07:00
Daniel Sandler
dba9356590 Break apart DISABLE_HOME and DISABLE_RECENT.
Additionally, start using setSystemUiVisibility() where
possible in the keyguard to allow activities and dialogs to
re-enable some of the navigation keys (notably: home but not
recents).

Finally, stop disabling MENU for activities atop the keyguard.

Bug: 5380495 // no home in driveabout, clock
Bug: 5396134 // able to show home/recent in keyguard
Change-Id: I04eb224554ee8cff79476b85148c4cda75bb0b62
2011-10-13 15:28:10 -04:00
Andreas Huber
6e80c50f10 Merge "NuPlayer is now taking on the task of streaming over RTSP." 2011-10-13 12:13:57 -07:00
Adam Powell
2c5b8cc71b Fix bug 5455676 - seek bars without thumbs
Change-Id: I9a4257b91a89cceeca7d5acf9358a8254446c784
2011-10-13 11:44:38 -07:00
Fred Quintana
35d0277548 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
a49b8ade7c Merge "Start adding simple performance tests for RS compute." 2011-10-13 11:43:03 -07:00
Fred Quintana
2984971db3 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
Jason Sams
065c25a9b0 Start adding simple performance tests
for RS compute.

Change-Id: I0a37067f028ff6e61fd9952764a22885ac717c7c
2011-10-13 11:41:09 -07:00
Scott Main
89c45b3ef0 docs: add toc to emulator doc and a few cross-links
Change-Id: I261c14e355e330d8daf5603dded4c0ef7028e090
2011-10-13 11:31:57 -07:00
Andreas Huber
a6be6dcd03 NuPlayer is now taking on the task of streaming over RTSP.
Change-Id: Ie204db8810807f1e7981959e34dc0149e5d9563a
2011-10-13 11:31:06 -07:00
Daniel Sandler
a77a299ad3 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
a7260731f4 Merge "Fixing typo on fragments page." 2011-10-13 10:52:18 -07:00
Daniel Sandler
1000e3fa06 Merge "Stop enabling all disabled status bar features from GlobalActions. (DO NOT MERGE)" into ics-mr0 2011-10-13 10:51:19 -07:00
Robert Ly
6cf7d9aa85 docs: tools and adt md5sum and file sizes
Change-Id: I9c6030cdcf4e8e7c09e81afb87b3611d647cff1b
2011-10-13 10:49:26 -07:00
Ben Murdoch
64f93d4f91 Merge "Don't redraw when not scrolling, even if finger is held down." 2011-10-13 10:17:57 -07:00
Adam Skory
73e96ea045 Fixing typo on fragments page.
Change-Id: If8a815621f90855d76cf71bf36725017ec9e6bd8
2011-10-13 18:08:35 +01:00
Andreas Huber
0eb6ef1798 Merge "Support for an MPEG2 Program Stream extractor." 2011-10-13 10:03:26 -07:00
Mangesh Ghiware
df3975c5ae 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
a6708c6a46 Merge "Add setting for configuring zoom level on double-tap." into ics-mr0 2011-10-13 09:17:10 -07:00
Brian Colonna
81cdada882 Fix 5437700: Underlying backup method was exposed
At one point we added a timeout to the black box that covers the
underlying backup unlock method so if Face Unlock doesn't start or
crashes, the user will see the backup method rather than being stuck
looking at a black box.  However, when powering the phone on and off
quickly, the message to time out the black box could be received at
the wrong time, causing it to expose the underlying backup method
when it shouldn't.

This solution clears the existing SHOW/HIDE messages from the
handler's message queue before sending a new SHOW/HIDE message.  In
particular, it clears out a delayed HIDE message when a SHOW is sent
so the SHOW can't be undone by a pending delayed HIDE message.

Also, logging errors for a couple of exceptions instead of rethrowing
so we can gracefully go to the backup in these cases.

Patch set 2 fixes problem where rare exceptions could prevent ever
binding to the service again because mBoundToFaceLockService was still
true.

Change-Id: Ieb7b6723161070f509277f67dc9ef100cf7c1aa6
2011-10-13 12:14:49 -04:00
Mike Lockwood
745e360103 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
0c265c886b Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0 2011-10-13 08:55:04 -07:00
Mike Lockwood
8334038f9e MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size
Bug: 5432487

Change-Id: Ie86e72d9d85476941eab6a9d271948b8fdde6926
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-13 11:38:20 -04:00
Justin Ho
99b1993f07 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
48cf582df3 Merge "Volume overlay right padding increased" into ics-mr0 2011-10-13 07:32:32 -07:00
The Android Open Source Project
ae0911df52 Reconcile with ics-mr0-release
Change-Id: I326384d8f33fbf4aceaf34331983727fd6bf256f
2011-10-13 07:04:51 -07:00
The Android Automerger
ffe7bbd90b merge in ics-mr0-release history after reset to ics-mr0 2011-10-13 06:28:07 -07:00
Ben Murdoch
fd8d3dede2 Don't redraw when not scrolling, even if finger is held down.
Signal the native side that we are not scrolling when a drag is
held motionless to stop screen updates.

Additionally, in the case that a drag is being held motionless,
send a timed message to keep the scroll bars on screen otherwise
they fade in and out, again causing repaints that shouldn't be
necessary.

Bug: 5440335
Change-Id: I94db0323879885fa48924b41d29e8af03e3b5e7f
2011-10-13 13:23:29 +01:00
Wu-cheng Li
7a3ba4d732 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
514a6cfb7f Merge "Improve camera javadoc and fix some errors." into ics-mr0 2011-10-12 23:34:01 -07:00
Wu-cheng Li
53b30912d3 Improve camera javadoc and fix some errors.
bug:5169599
Change-Id: Ic2205770753ff462135f884fee0a888ca8ec832d
2011-10-13 12:04:05 +08:00