75236 Commits

Author SHA1 Message Date
Robert Greenwalt
a697f4069d Merge "Stop complaining about failure to remove routes" 2012-04-24 09:28:45 -07:00
Martijn Coenen
ba4dd937fe Merge "Allow enabling Bluetooth without auto-connecting." 2012-04-24 09:03:33 -07:00
Steve Block
f03f64d810 Merge "Update WebViewClassic JavaDoc to refer to WebView" 2012-04-24 03:22:27 -07:00
Steve Block
406aeb2a9d Update WebViewClassic JavaDoc to refer to WebView
Change-Id: I5152ce82111dc661e5dc723d5c3402f2765b7312
2012-04-24 11:20:29 +01:00
Jonathan Dixon
26ed99f3f5 Merge "static methods in CookieManger call via instance" 2012-04-24 03:01:55 -07:00
Jonathan Dixon
be58c40646 static methods in CookieManger call via instance
This allows CookieManager subclasses to correctly override all behvaior
in the base class.

Bug: 6379925
Change-Id: Ife02db24bc192bc1eabf09e0d64668716786d237
2012-04-24 09:48:28 +01:00
Romain Guy
5479e29121 Merge "I broke the build after all... here's a fix." 2012-04-23 20:46:04 -07:00
Romain Guy
d4caee0e50 I broke the build after all... here's a fix.
Change-Id: I970715fcff5a74a0ce272654c2ea79e4ab3684bf
2012-04-23 20:44:04 -07:00
Adam Powell
b6ad9d9205 Merge "Don't launch ACTION_QUICK_CONTACT activities in a new task." 2012-04-23 20:38:34 -07:00
Romain Guy
3d745c03ac Fix the build before the bot yells at me.
Change-Id: Ice7fe02b684ad662262aae3cac7a48a835ebcad5
2012-04-23 20:36:17 -07:00
Romain Guy
ba6be8a62d Prevent WebView from crashing when detached from the window
Bug #6365056

WebView enqueues a functor in the hardware renderer to handle
animations and this functor is called at a later time by the
hardware renderer. However, the functor was not removed from
the queue when WebView was removed from the window. This could
cause the hardware renderer to attempt to execute an invalid
functor and lead to a crash.

Change-Id: I9d38e80f3fdc5e29d4d0cdfa1e893c251a954508
2012-04-23 20:29:31 -07:00
Adam Powell
619ffd70b1 Don't launch ACTION_QUICK_CONTACT activities in a new task.
Change-Id: Ib6ea6da88cd8addbc02398c29bb7a0b455b02bda
2012-04-23 19:22:46 -07:00
Maurice Chu
88fffb7a34 Merge "Fix build breakage resulting from change id: Ia1038f45" 2012-04-23 19:06:09 -07:00
Maurice Chu
2dfba0e6cf Fix build breakage resulting from change id: Ia1038f45
Corrected adding a backslash before apostrophes in the strings.xml file.

Change-Id: I83574042184c9abb78409441ddf2d0e58a68f207
2012-04-23 19:03:13 -07:00
Gilles Debunne
8b48244668 Merge "Centered text is not updated" 2012-04-23 18:31:22 -07:00
Craig Mautner
b67c63b1ae Merge "Set mOrientationChangeComplete after windows drawn." 2012-04-23 18:20:28 -07:00
Gilles Debunne
9177947741 Merge "Fixed SSB. Correct broadcast of removed spans' positions" 2012-04-23 18:17:30 -07:00
Craig Mautner
924c21582c Set mOrientationChangeComplete after windows drawn.
Force a pass through layout with mOrientationChangeComplete set
following all windows drawn when the application is freezing the
screen.

This fixes bug 6359311.

Change-Id: I318864fb687cf85a0c9ac4478e4f29dc20f43d9c
2012-04-23 18:14:07 -07:00
Robert Greenwalt
2473a4bae1 Stop complaining about failure to remove routes
We often get told a network has gone away after the interface is downed
and the routes are auto-removed.  Change the log to VDBUG so standard
builds don't have the noise.

bug:2856577
Change-Id: If12ec3ed3b646ff6ef89b3778d037cfc478c0d25
2012-04-23 18:00:37 -07:00
Jake Hamby
376011e895 Merge "After reboot with airplane mode and BT enabled, keep BT enabled." 2012-04-23 17:57:05 -07:00
Maurice Chu
395d725ff4 Merge "Changed the description of android.permission.READ_CONTACTS" 2012-04-23 17:56:07 -07:00
Xavier Ducrohet
6a17922fcf Merge "Fix Paint_Delegate with missing native method." 2012-04-23 17:43:03 -07:00
Xavier Ducrohet
cb092e2b7f Fix Paint_Delegate with missing native method.
Change-Id: I39638dcb323fdd1ec3cb58dcad05757145d09026
2012-04-23 17:41:37 -07:00
Maurice Chu
8aae6a8e94 Changed the description of android.permission.READ_CONTACTS
Bug:6141955
Change-Id: Ia1038f45d4f72358446ec265130bb34f8b228f82
2012-04-23 17:34:59 -07:00
Glenn Kasten
2427a4c49e Merge "Scheduling group cleanup" 2012-04-23 17:11:55 -07:00
Jeff Brown
a8d6ddee98 Merge "More work on international keyboards." 2012-04-23 16:53:28 -07:00
Gilles Debunne
fb9f5be318 Centered text is not updated
Bug 6378843

Emergency fix. May submit a proper fix with less translations later.

Change-Id: I9d8348e29d5436580202d3ee0456d341bf81dab8
2012-04-23 16:51:29 -07:00
Daniel Sandler
8d98200650 Merge "Expand hit rectangles of main navigation buttons." 2012-04-23 16:40:13 -07:00
Martijn Coenen
6c614b7e59 Allow enabling Bluetooth without auto-connecting.
This is a feature used for NFC-to-Bluetooth handover:
we want to enable BT for file transfer, and disconnect
it when we're done. During this period we don't want
to auto-connect other devices - it should be transparent
to the user that Bluetooth is used. Also, don't allow
A2DP/HSP incoming connections.

Change-Id: I0a03e8084c439b1271b6a80f4d9da5aacfe19c45
2012-04-23 16:25:30 -07:00
Jake Hamby
9341f389db After reboot with airplane mode and BT enabled, keep BT enabled.
Enabling airplane mode disables Wi-Fi and Bluetooth as well as the
cell radio. Bluetooth and Wi-Fi can then be reenabled if desired.
After a reboot, Bluetooth was always disabled if airplane mode
was enabled. Changed to set Bluetooth to its previous state after
reboot, regardless of the airplane mode setting. This is already
the behavior for Wi-Fi after a reboot.

Bug: 5623624
Change-Id: I1c44500221aa0e5d1d7a5c9046d6c1380d28b5c0
2012-04-23 16:15:42 -07:00
Jeff Brown
8bca94ad83 More work on international keyboards.
Changed the English US keymaps to implement a strict US key map
with no additional ALT functions.

Fixed a bug copying the alias in the InputDevice copy constructor.

Added support for end of line comments in KCM and KL files.

Added the German keyboard layout.

Sorted the keys in the keyboard layout files by physical arrangement
to make it easier to maintain them.

Bug: 6110399
Change-Id: If44d83de5b98f2bf0016cbb8e12264387b286aaa
2012-04-23 16:12:32 -07:00
Gilles Debunne
b983e27af4 Merge "Re-added a flag to prevent the IME from showing" 2012-04-23 15:53:37 -07:00
Romain Guy
ad6283e48a Merge "Invoke onTrimMemory with an EGL context Bug #6369600" 2012-04-23 15:31:08 -07:00
Glenn Kasten
f1b56449f5 Scheduling group cleanup
The C++ API for scheduling groups is going away, so use the C API.

Renumber THREAD_GROUP_* constants to have the same values as SP_*.
They are @hide so this should be OK.

The old THREAD_GROUP_FG_BOOST constant is removed, and replaced by a
(private) THREAD_GROUP_FOREGROUND constant that is just a placeholder
to correspond to SP_FOREGROUND.  It is not usable at this level.

Improved performance of android_os_Process_setProcessGroup:
avoid unnecessary syscall to getpriority for each tid.

Fixed error handling in android_os_Process_setThreadGroup.
It raises an exception if set_sched_policy() returns an error.

Add comments and fix typos in existing comments.

Change-Id: Ib922e92c945985c695ef0addbd2b83b8e82865f8
2012-04-23 15:30:02 -07:00
Romain Guy
19f86e831e Invoke onTrimMemory with an EGL context
Bug #6369600

Change-Id: I3ded47c3688ef2f2873495392c35e898357204da
2012-04-23 15:19:07 -07:00
Scott Main
9919a4a1b2 am aab79e54: am d5955b02: Merge "docs: add section to basic intent class about using the activity chooser" into ics-mr1
* commit 'aab79e541afa3176e52b7becde5086c7934a89e2':
  docs: add section to basic intent class about using the activity chooser
2012-04-23 15:16:11 -07:00
Scott Main
aab79e541a am d5955b02: Merge "docs: add section to basic intent class about using the activity chooser" into ics-mr1
* commit 'd5955b02365d35f3f9e8fc261fc22e6d2ac9f6bf':
  docs: add section to basic intent class about using the activity chooser
2012-04-23 15:13:04 -07:00
Scott Main
d5955b0236 Merge "docs: add section to basic intent class about using the activity chooser" into ics-mr1 2012-04-23 15:11:04 -07:00
Scott Main
1cf9255ec7 docs: add section to basic intent class about using the activity chooser
Change-Id: Ib2a889429895a24ced2db365d6e4afdf44c3086e
2012-04-23 14:55:11 -07:00
Jeff Sharkey
57a6e14e57 Merge "Clear identity when checking if bandwidth enabled." 2012-04-23 14:40:13 -07:00
Jeff Sharkey
49c1d1764b Clear identity when checking if bandwidth enabled.
Change-Id: I0f10f86dc14483e29609057c671454b322da4826
2012-04-23 14:39:19 -07:00
Marco Nelissen
9ae1b69fbb Merge "Speed up playlist processing" 2012-04-23 14:26:25 -07:00
Daniel Sandler
6ae7b5807a Expand hit rectangles of main navigation buttons.
There's now no dead space between them. Also, increase the
visual size of the nav icons by 30% (just a quick resample
of the current artwork, to be replaced by custom-drawn
graphics at 130%).

The background glow looks kind of comical right now.

Bug: 6381833
Change-Id: I03ef0ea64a9e953f9f2b29cc03097d250ff52134
2012-04-23 17:15:15 -04:00
Quddus Chong
fd6a5245cc am 2bf56f00: am 378da38d: docs: Fixed the url for the Aplication Licensing link. Bug: 6322460
* commit '2bf56f009f4e0d9d35105ac75d459351e149b54d':
  docs: Fixed the url for the Aplication Licensing link. Bug: 6322460
2012-04-23 14:07:58 -07:00
Quddus Chong
2bf56f009f am 378da38d: docs: Fixed the url for the Aplication Licensing link. Bug: 6322460
* commit '378da38db81093b0ce98dbe24ade3de0bb87bd5c':
  docs: Fixed the url for the Aplication Licensing link. Bug: 6322460
2012-04-23 14:04:54 -07:00
Marco Nelissen
08f70fa5b8 Speed up playlist processing
When matching entries in playlists, only consider audio files.

b/6346786

Change-Id: Ia744d002c2821a81840303b9409593da48a08b73
2012-04-23 13:53:20 -07:00
Chris Wren
b023bf85a0 let default notifications with actions get bigger that 64dp.
Bug: 6377749

Change-Id: I8c92ef67b59f7a44b61926c32480cce6990a1375
2012-04-23 13:51:52 -07:00
Adam Powell
32ef750af0 Merge "Add TaskStackBuilder#addParentStack(ComponentName)" 2012-04-23 13:41:36 -07:00
Chet Haase
27bfcedc37 Merge "Remove USE_DISPLAY_LIST_PROPERTIES flag" 2012-04-23 13:36:46 -07:00
Jeff Sharkey
258783e09b Merge "Grant external storage permissions to SystemUI." 2012-04-23 13:33:28 -07:00