28965 Commits

Author SHA1 Message Date
Anatol Pomazau
a003776821 Merge changes I7459b9e9,I9bc5573e
* changes:
  frameworks base Android.mk file changes
  Deleted the media, camera, drm related files since they are relocated
2012-03-28 12:21:13 -07:00
Gilles Debunne
59075643ac Merge "Handle non DynamicLayout in Editable draw method." 2012-03-28 11:11:48 -07:00
Gilles Debunne
ee9da04edc Merge "Moving focus on text should not create an Editor" 2012-03-28 11:05:43 -07:00
James Dong
ba4d043331 frameworks base Android.mk file changes
Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
2012-03-28 11:03:25 -07:00
James Dong
d927a1d996 Deleted the media, camera, drm related files since they are relocated
Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
2012-03-28 10:42:44 -07:00
George Mount
f9c1f9935b Snap selection handles to text
Bug 6198286
 Webkit Change: I55604f3ec28586beaec5fd98a27c9f4b8a59a8a5

Change-Id: I3c51ed5f6988d58440badfbe8b076fd83d48ae2a
2012-03-28 07:10:34 -07:00
Steve Block
7de2ae2564 Merge "Remove superfluous code after removal of Android HTTP stack" 2012-03-28 05:18:57 -07:00
Jonathan Dixon
c53471cf4d Merge "Tidy up usage of URLUtil constants" 2012-03-28 03:56:29 -07:00
Jonathan Dixon
0fa72ef10e Tidy up usage of URLUtil constants
Several of these are duplicated; referring to a single source makes the code
paths using them easier to track down.
(also removing a spurious import)

Bug: 6237833

Change-Id: Ibdacc124c047e37c7f0ced9ecc6f26ae3e6b4326
2012-03-28 10:09:39 +01:00
Kenny Root
fb32ab903a Update Wifi tests
Wifi tests used old WifiConfiguration values. This updates it to the new
values.

Change-Id: I14498aebba50f906181fa377b84855eae3d046fc
2012-03-27 21:12:08 -07:00
Daniel Sandler
fc90b6a7c7 Merge "Add text labels to intruder actions." 2012-03-27 19:19:01 -07:00
Gilles Debunne
0711047af7 Handle non DynamicLayout in Editable draw method.
An Editable text will use a BoringLayout when the text is empty.
Fallback on the regular layout draw text method when the layout
does not support the block optimisation.

Change-Id: Ie4bdb4381f2f58b71d7c35b2f5734e544e3115ea
2012-03-27 19:01:22 -07:00
Jeff Brown
73667fe34a Merge "YieldTransaction should actually commit the transaction." 2012-03-27 18:20:04 -07:00
Jeff Brown
d19ff5f95d YieldTransaction should actually commit the transaction.
Bug: 6239243
Change-Id: I2e0dfb0c8f0b062674cc2a1c14955eba9a4b9df3
2012-03-27 18:13:11 -07:00
Gilles Debunne
4cb85f6ad6 Moving focus on text should not create an Editor
Bug 6241159.

onCreateInputConnection should not create an Editor but instead
should return an input connection iff the text is editable.

Change-Id: Ie9ea55b2467f5a40e6243b36f9b44fa6dfab586f
2012-03-27 18:12:14 -07:00
Eric Fischer
31074a5d5d Merge "Import translations. DO NOT MERGE" 2012-03-27 16:12:47 -07:00
Tom Taylor
db2026000a Merge "Drm encode mms parts while persisting the pdu" 2012-03-27 15:51:23 -07:00
Tom Taylor
ca184870ca Drm encode mms parts while persisting the pdu
Bug 5158047

Change-Id: I88aba9a91192fb1eb730b48efad3b2b488abad3d
2012-03-27 15:42:16 -07:00
Nick Kralevich
5b8fd25029 Merge "Make READ_LOGS signature|system|development" 2012-03-27 14:55:34 -07:00
John Reck
47d3d87e6d Merge "Do pause painting better" 2012-03-27 13:38:11 -07:00
John Reck
834f66b6a4 Do pause painting better
Change-Id: Ia58bbb19cea899c8826d74d7afcbd7e7c541d9c6
2012-03-27 12:52:57 -07:00
Eric Fischer
6447f22b36 Import translations. DO NOT MERGE
Change-Id: Ib76eb1342c224a7e9fba7693f5fcb7f3e816ff39
2012-03-27 12:32:15 -07:00
Amith Yamasani
8b5bce8d90 Merge "User management and switching" 2012-03-27 11:24:54 -07:00
Amith Yamasani
135936072b User management and switching
Broadcast intents that get sent out when users are added/removed/switched.

More work on generating user-specific information in package manager queries.
APIs to update user name and query a user by id.
Removed Package.mSetStopped and mSetEnabled, since they're not user specific.

User removal:
- Cleanup ActivityManager, PackageManager, WallpaperManager, AppWidgetService
  and AccountManager.
- Shutdown processes belonging to the user.

Don't show vibrate option in long-press power if there's no vibrator.

Lock the screen when switching users, to force unlocking.

Change-Id: Ib23a721cb75285eef5fd6ba8c7272462764038fa
2012-03-27 11:23:01 -07:00
Jeff Sharkey
40bd578db8 Merge "Avoid ClassCast when migrating ACTION_SEND extras." 2012-03-27 10:49:19 -07:00
Jeff Sharkey
f27ea66114 Avoid ClassCast when migrating ACTION_SEND extras.
Bug: 6231948
Change-Id: I008195fa973517446b2400ed3f59af0cbf0fc925
2012-03-27 10:34:24 -07:00
Chet Haase
b85967b9af Re-enabling DisplayList properties
Several issues came up after DisplayList properties were enabled,
so they were disabled pending fixes. Those issues have been fixed, so
DisplayList properties are once again being enabled by default. This
CL both re-enables these properties (in View.java and DisplayListRenderer.h)
and fixes the various issues that enabling them caused the first time around.

Related issues (all currently marked as Fixed, though that was simply because
DL properties were disabled - this CL provides the real fixes now that
DL properties are enabled by default):
Issue #6198276 Text input broken
Issue #6198472 Native crash at pc 00076428 in many different apps in JRM80
Issue #6204173 Date/time picker isn't rendering all parts of UI
Issue #6203941 All Apps overscroll effect is rendered weirdly/has flickering
Issue #6200058 CAB rendering issue - not drawing items?
Issue #6198578 Front camera shows black screen after taking picture.
Issue #6232010 Layers not recreated when children change (DisplayList properties)

Change-Id: I8b5f9ec342208ecb20d3e6a60d26cf7c6112ec8b
2012-03-27 08:17:54 -07:00
John Reck
628e2345cc Merge "Workaround issue of getting 0,0,0,0 inval rects" 2012-03-26 17:25:15 -07:00
John Reck
ca835dbda1 Workaround issue of getting 0,0,0,0 inval rects
Bug: 6142700
 WebKit is sending an empty inval rect for some reason, which results
 in WebView not being invalidated. Assume an empty inval means a
 full inval

Change-Id: Ib93b806f8f8fd2039e2a0e43de2372c3e6be2433
2012-03-26 17:21:33 -07:00
Romain Guy
1fc18056eb Merge "Fix constants to be unique" 2012-03-26 17:15:57 -07:00
Romain Guy
c553fea6b0 Fix constants to be unique
Change-Id: Ia3736bc35c9ff7b52f0f20c274cd302bfb180fa7
2012-03-26 17:09:19 -07:00
Wink Saville
195306cdec Merge "Add SM_INIT_CMD." 2012-03-26 17:07:36 -07:00
Fabrice Di Meglio
81e829e02e Merge "Fix bug #6213159 FocusFinder should be able to take care of Views direction" 2012-03-26 17:06:11 -07:00
Romain Guy
56485fe628 Merge "Use a status_t return type for GL functors" 2012-03-26 16:51:22 -07:00
Romain Guy
6554943a1d Use a status_t return type for GL functors
WebView needs more fine-grained control over the behavior of the
framework upon execution of the display lists. The new status_t
allows WebView to requests its functor to be re-executed directly
without causing a redraw of the entire hierarchy.

Change-Id: I97a8141dc5c6eeb6805b6024cc1e76fce07d24cc
2012-03-26 16:45:05 -07:00
Gilles Debunne
91889e2c86 Merge "Update to TextView#didTouchFocusSelect documentation" 2012-03-26 16:38:57 -07:00
Wink Saville
cea056f589 Add SM_INIT_CMD.
The enter methods of the initial states are now executed
in response to a message and therefore run in the handler
associated with the StateMachine. Previously these would
run in the thread that start() was called from.

I ran into a problem where in an Activities onCreate I called
StateMachine#start(), which called the default states enter,
which invoked Context#bindService. But bindService never
completed because onCreate hadn't returned. But invoking the
enter methods on the StateMachines handler this problem does
not occur.

Change-Id: I2c2e52e5de29a987c098196a0efdba446cbc29d0
2012-03-26 15:03:16 -07:00
Philip Milne
80e4ee4600 Merge "Fixes for bugs: 6104423, 6103563, 6103509, 6103807 & 6103253." 2012-03-26 14:55:36 -07:00
Fabrice Di Meglio
0adcd07ccb Merge "Improve View layoutDirection resolution" 2012-03-26 14:06:56 -07:00
Eric Fischer
9d4b8811c1 Merge "Import translations. DO NOT MERGE" 2012-03-26 13:49:52 -07:00
Philip Milne
aac722a9c0 Fixes for bugs: 6104423, 6103563, 6103509, 6103807 & 6103253.
Add properties to Java API so as to better mirror the framework's XML API.

I'm not familiar with many of these areas so this CL is worth some scrutiny.

Change-Id: Iff63c43521305efaad5a2189c1b5556d2353cbd4
2012-03-26 13:46:33 -07:00
Daniel Sandler
b2a1c23a55 Add text labels to intruder actions.
Change-Id: I544bed7b37c043639ee0e6a11bf757c0a191c1fc
2012-03-26 16:25:21 -04:00
Eric Fischer
966f26e75b Import translations. DO NOT MERGE
Change-Id: I4f9ab5611d594523b15cd15609bc76b4a0d54a87
2012-03-26 13:09:00 -07:00
Fabrice Di Meglio
9b0e599120 Merge "Fix View textDirection refresh" 2012-03-26 12:40:35 -07:00
Fabrice Di Meglio
827d5c09fb Fix View textDirection refresh
- the refresh was no more done correctly after the use of display lists

Change-Id: I5c74bbe565c603fe2e7fd793dd49c3b20036e04b
2012-03-26 12:15:42 -07:00
Steve Block
f2bfe2bc05 Remove superfluous code after removal of Android HTTP stack
See b/5495616.

Bug: 6228353
Change-Id: I16cfd7b37973919d5bf14d2d80954caede264961
2012-03-26 19:05:14 +01:00
Jesse Wilson
e300d82828 Merge "Add an API to expose Next Protocol Negotiation (NPN)." 2012-03-26 10:14:44 -07:00
Victoria Lease
6af84f678d Merge "move FindListener into WebView" 2012-03-26 09:13:08 -07:00
Victoria Lease
d405a433e6 move FindListener into WebView
Also took advantage of the opportunity to adjust the javadoc.

Bug: 6052412
Change-Id: I3de2cc6f2b5af20acb87d6e0a105ac12b1be679b
2012-03-26 08:49:49 -07:00
Daniel Sandler
9ea03b9f29 Merge "Add remotable methods for TextView's compound drawables." 2012-03-26 06:51:28 -07:00