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

61767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
87e06ec2fa Merge "Fix issue #5144065: Tap on Music icon from Home screen..." into ics-mr1 2011-12-07 15:01:55 -08:00
Winson Chung
0a361b10a6 Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1 2011-12-07 14:33:31 -08:00
Dave Burke
54a53841a9 Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1 2011-12-07 14:05:41 -08:00
Dianne Hackborn
ae0a0a84d1 Fix issue #5144065: Tap on Music icon from Home screen... 
... a different app opens

In some cases when reparenting activities we could end up with a reply
chain that crosses task boundaries, so if an activity below that needs
to be reparented we pull that and the activities above it up into the
new task.

Change-Id: Ia4fa041ab7069e39dac162ddbf5b8e1de98675b9
 2011-12-07 14:03:01 -08:00
Robert Greenwalt
3957b5fc49 Fix the build. 
Change-Id: I71d1d9958182966d2eff0d34fa05ac57f2cabc48
 2011-12-07 13:10:59 -08:00
Andreas Huber
7dea9aaff5 Fetch at least 192KB to avoid our mp3 sniffer from blocking on data. 
Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59
related-to-bug: 5666532
 2011-12-07 12:50:47 -08:00
Robert Greenwalt
f352491aad Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 2011-12-07 12:29:14 -08:00
Irfan Sheriff
a85cc28229 Merge "Fix CS wakelock handling" into ics-mr1 2011-12-07 12:06:31 -08:00
Bart Sears
b56076ac9f Merge "Fix WebTextView rings" into ics-mr1 2011-12-07 11:41:57 -08:00
Joe Malin
3744d1faf5 am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0 
* commit '9e2cf49fa360e70b33a870e9ae0b3eec11752972':
  DOC CHANGE: Add Content URI ref doc
 2011-12-07 11:28:25 -08:00
Irfan Sheriff
87f0a7b1aa Fix CS wakelock handling 
Change-Id: Ibe1c1ab3e26ff0ae7cab7bfb0bd868bfab246037
 2011-12-07 11:28:21 -08:00
Joe Malin
9e2cf49fa3 Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0 2011-12-07 11:26:20 -08:00
Dianne Hackborn
fb90df8c6e Merge "Truthiness is good." into ics-mr1 2011-12-07 10:33:19 -08:00
Robert Greenwalt
d4420ab2fb Trim leading zeros from ipv4 addrs. 
Underlying libraries will interpret leading zeros as octal values and
fail.

bug:5262995
Change-Id: Iff949225bb6b941f7274ee81754e1f41ed719a6c
 2011-12-07 09:58:48 -08:00
The Android Open Source Project
3de8d36b6f Reconcile with ics-mr0-release 
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
 2011-12-07 07:24:54 -08:00
Irfan Sheriff
8a4cd3b105 Merge "Disable poor network connection alone" into ics-mr1 2011-12-06 21:06:03 -08:00
John Reck
8463c88ddf Fix WebTextView rings 
Bug: 5718531
 Don't scroll the rings and fix the border's alpha

Change-Id: I5e629d2b3b1b2bf4760c01d0f927e3f81949e9bd
 2011-12-06 17:38:57 -08:00
Scott Main
0a83e9d438 am b6322a5b: docs: fix broken links bug: 5542371 
* commit 'b6322a5bb9fda370cccf89434b939370dfa36b02':
  docs: fix broken links bug: 5542371
 2011-12-06 17:12:53 -08:00
Scott Main
b6322a5bb9 docs: fix broken links 
bug: 5542371

Change-Id: If04b39918a54ccc163d255bf75d566f1875dac0a
 2011-12-06 17:09:37 -08:00
Irfan Sheriff
19380daaf4 Disable poor network connection alone 
- Keep the walled garden detection in place

Bug: 5719771
Change-Id: I9e5d69b6d56096be904106b1db48c02db4c0fb50
 2011-12-06 16:21:03 -08:00
Andreas Huber
791a31832a Merge "Merge commit 'babb7200' into manualmerge" into ics-mr1 2011-12-06 16:20:01 -08:00
Fabrice Di Meglio
1e99421196 Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1 2011-12-06 15:47:27 -08:00
Hong Teng
6db79c35c0 Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1 2011-12-06 15:37:25 -08:00
Amith Yamasani
f336408000 Merge "New and improved silent mode on lockscreen." into ics-mr1 2011-12-06 15:36:10 -08:00
Fabrice Di Meglio
99cdc6a3b5 Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE) 
- disable GSUB / GPOS table loading

Change-Id: I2ae058c9d926242586f90dc2a98302ff886f1fe1
 2011-12-06 15:31:19 -08:00
Andreas Huber
485d82c5e2 Merge commit 'babb7200' into manualmerge 2011-12-06 15:03:10 -08:00
Amith Yamasani
6243edd818 New and improved silent mode on lockscreen. 
3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.
No volume dialog on lockscreen, unless Power menu is up.

Set VIBRATE_IN_SILENT=1 when upgrading device.

Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
 2011-12-06 14:48:38 -08:00
Andreas Huber
81cab1752e DO NOT MERGE: Remove the AVI extractor. 
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
 2011-12-06 14:23:38 -08:00
Irfan Sheriff
b87d22b865 Disable wifiwatchdog for now 
Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
 2011-12-06 14:23:38 -08:00
Winson Chung
c3f581b047 Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782) 
Change-Id: Ic57a7ce85f41d58cd40b7d30eef4a1bf685182e5
 2011-12-06 14:21:10 -08:00
Adam Powell
720efc43d8 Merge "Lower touch slop in ViewConfiguration." into ics-mr1 2011-12-06 13:58:20 -08:00
James Dong
6b8b5a0a41 Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 2011-12-06 12:52:52 -08:00
Andreas Huber
05d6306911 Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 2011-12-06 12:44:53 -08:00
Andreas Huber
babb72006b Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr0 2011-12-06 12:11:38 -08:00
Adam Powell
7d39f85acf Lower touch slop in ViewConfiguration. 
Our typical touchscreens are now good enough that we don't need the
touch slop to be as large as it once was. Lower it to increase
responsiveness while scrolling.

Move the touch slop constant to the config resource
config_viewConfigurationTouchSlop so that it may be more easily
tweaked in device-specific overlays.

Change-Id: I7c11d8affcb98e91654203beb13a26cfeec18f7c
 2011-12-06 12:08:47 -08:00
Hong Teng
96bea6a5e9 Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails 
-Correct the invalid filename, which contains control character.
 And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.

Change-Id: I77862e55e8ee990f72f617a804f26fd724914b5b
 2011-12-06 11:51:47 -08:00
Irfan Sheriff
40cb30c2df am 7b62313e: Disable wifiwatchdog for now 
* commit '7b62313eab4af8835a64fb3fe1e15e5e534a9479':
  Disable wifiwatchdog for now
 2011-12-06 11:34:58 -08:00
Andreas Huber
92f604c4d4 DO NOT MERGE: Remove the AVI extractor. 
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
 2011-12-06 11:24:34 -08:00
Irfan Sheriff
7b62313eab Disable wifiwatchdog for now 
Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
 2011-12-06 11:21:22 -08:00
Andreas Huber
142a04aed5 DO NOT MERGE: Remove the AVI extractor. 
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
 2011-12-06 11:21:02 -08:00
Gilles Debunne
98a85c2de6 Merge "Invalidated bounds tightened in TextView" into ics-mr1 2011-12-06 11:20:18 -08:00
Eric Fischer
58ad16cfea Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-06 10:34:41 -08:00
Eric Fischer
c92b5c227a Import revised translations. DO NOT MERGE 
Change-Id: I1d49a1533bd0481543280a379a9f93bd7027e54a
 2011-12-06 10:27:06 -08:00
Svetoslav Ganov
ea25ea7ef3 Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1 2011-12-06 10:27:04 -08:00
Jeff Brown
4079702ac2 Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1 2011-12-05 22:50:49 -08:00
Jim Miller
17f9fe13c7 Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1 2011-12-05 22:12:54 -08:00
Jesse Hall
3e7b412d7d Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1 2011-12-05 21:23:29 -08:00
Jeff Brown
f98c2a67fe Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE) 
Ensure log_clusters array is big enough.
Bug: 5714171

Explicitly handle the cases where the entire string or a single
run might have a length of 0.
Harfbuzz assumes the length of the item is at least 1.
If the length is zero, then it will clobber memory at index -1
into the log_clusters array.
Bug: 5705479

Change-Id: If28a9866221081f69973c1d12d7fe0cf8db2edd0
 2011-12-05 20:40:03 -08:00
Matthew Xie
0d9a41e74c Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1 2011-12-05 19:56:54 -08:00
Dianne Hackborn
0c0120efa2 Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 2011-12-05 19:16:54 -08:00