drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,649 Commits 1 Branch 0 Tags
Commit Graph

59649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
6c65e8b62b merge in ics-mr0-release history after reset to ics-mr0 2011-10-13 16:57:44 -07:00
Martijn Coenen
19fa262c52 Merge "Send ACTION_USER_PRESENT when provisioning is completed." into ics-mr0 2011-10-13 16:47:02 -07:00
Dianne Hackborn
97e9ea98af Merge "Fix bug with CLEAR_TASK -- wouldn't clear the top activity." into ics-mr0 2011-10-13 16:44:26 -07:00
Dave Santoro
e6063299d8 Merge "Add hidden API for pre-authorizing URIs." into ics-mr0 2011-10-13 16:32:17 -07:00
Dianne Hackborn
eabd328dee Fix bug with CLEAR_TASK -- wouldn't clear the top activity. 
Maybe this will also fix bug #5144065 as well.

I doubt I am so lucky, though.

Change-Id: I60bf595d3eff79353fdd94b0f2a089e81218bc30
 2011-10-13 16:26:49 -07:00
Bart Sears
bcfe41529b Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0 2011-10-13 16:25:29 -07:00
Jim Miller
6252a8b116 Merge "Fix 5386408: Send accessibility event when a recent app is removed." into ics-mr0 2011-10-13 16:21:51 -07:00
Adam Powell
50b15348c5 Merge "Bug 5312828 - Menu button not responding" into ics-mr0 2011-10-13 16:13:55 -07:00
Jason Sams
43b57ec48e Fix error printing if no command string is set. 
Change-Id: I588c0d0a4e1b8f80c967ebfb6aff179a0cac4a36
 2011-10-13 16:05:27 -07:00
Adam Powell
c6d51889c2 Bug 5312828 - Menu button not responding 
Increase tolerance for apps calling invalidateOptionsMenu at
inconvenient times.

Change-Id: I712b20002afd0f056c3f05b160c5fa9c2ef0b552
 2011-10-13 15:51:25 -07:00
Steve Block
33f962b22e Improve JavaDoc for WebView.loadData() 
Make clear that the charset specified in the mediatype portion of a data URL
overrides that specified in the HTML or XML document itself.

Bug: 5418915
Change-Id: Iff7305b6ac9e656d0fb7ed1b2ffe6fd0e21be49b
 2011-10-13 15:32:13 -07:00
Justin Ho
846601a162 Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0 2011-10-13 15:23:20 -07:00
Justin Ho
d0922340aa Revert "Updated volume rocker assets for ring notification icon" 
This reverts commit 56505a6e7983d03b051d451d6120f29ccce8e09e
 2011-10-13 15:22:53 -07:00
Justin Ho
210ccb8110 Merge "Updated wifi in range status bar notification icon" into ics-mr0 2011-10-13 15:17:34 -07:00
Justin Ho
b5e8a2955a Merge "Updated volume rocker assets for ring notification icon" into ics-mr0 2011-10-13 15:17:22 -07:00
Justin Ho
96ae383d9e Merge "Updated speakerphone asset" into ics-mr0 2011-10-13 15:16:52 -07:00
Justin Ho
41f45e4969 Merge "Updated stat_sys wifi icons" into ics-mr0 2011-10-13 15:16:37 -07:00
Justin Ho
86e12a82d2 Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0 2011-10-13 15:16:11 -07:00
Justin Ho
caea6473b4 Merge "Updated cut actionbar icon" into ics-mr0 2011-10-13 15:15:48 -07:00
Justin Ho
a197abdc52 Updated wifi in range status bar notification icon 
Change-Id: I5e91d14473908086848db552acec0df90e7104c2
 2011-10-13 15:13:44 -07:00
Justin Ho
56505a6e79 Updated volume rocker assets for ring notification icon 
Change-Id: Ibcdd8e88efaaba9e91a1b6959a83207c747b3195
 2011-10-13 15:12:09 -07:00
Justin Ho
874c2c487b Updated speakerphone asset 
Change-Id: I5c799853a8ad851670cc58c8b4052859d8363d93
 2011-10-13 15:10:41 -07:00
Justin Ho
719aeb5f17 Updated cut actionbar icon 
Change-Id: Ib523594be8b3923adc21c6bee2ea4522f4fded79
 2011-10-13 15:04:03 -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
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
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
b14b2c25c2 Merge "docs: tools and adt md5sum and file sizes" into ics-mr0 2011-10-13 13:20:08 -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
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
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
Dave Santoro
e43185e21d Add hidden API for pre-authorizing URIs. 
This allows the contacts provider to allow a caller to pre-authorize
a URI for temporary use by another application that would not
otherwise have the special permissions necessary to access it.

Bug 5437453

Change-Id: I3bd7be7c698cac73709c2d305f1723cdcb093ec4
 2011-10-13 12:08:42 -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
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
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
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
Justin Ho
1084195d51 Updated stat_sys wifi icons 
Change-Id: I28d022bc554656c23adcf959df00b0b1c5fd95a9
 2011-10-13 09:26:31 -07:00
Justin Ho
e0676f5b27 Updated Systembar back and highlight assets 
Bug: 5411737

Change-Id: Ia33eec3e7a10650d64fd5999712c6baa54ace24f
 2011-10-13 09:22:46 -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
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
48cf582df3 Merge "Volume overlay right padding increased" into ics-mr0 2011-10-13 07:32:32 -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
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
Scott Main
8da119148f cherrypick from hc-mr2 Change-Id: I76de309e70026720d30772ff5b428f7aefc8de4c 
docs: add docs about "screenSize" configuration changes

Change-Id: I74ca6126d1f61f30014c17c8bd2316c6d05c8aeb
 2011-10-12 20:52:18 -07:00