17356 Commits

Author SHA1 Message Date
Kenny Root
d9fa11b446 am 312206b9: Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb
* commit '312206b98749bbe395416634e6e82bd242b1d5f2':
  Add the {get,set}PackageObbPaths calls to API
2011-01-14 12:44:39 -08:00
Kenny Root
312206b987 Merge "Add the {get,set}PackageObbPaths calls to API" into honeycomb 2011-01-14 12:42:12 -08:00
Christopher Tate
e1cc00bba0 am 64cb24e6: Merge "Send DRAG_STARTED notices to views that become visible during drag" into honeycomb
* commit '64cb24e686b13aabe3d28e049796c8315b011485':
  Send DRAG_STARTED notices to views that become visible during drag
2011-01-14 12:38:24 -08:00
Christopher Tate
64cb24e686 Merge "Send DRAG_STARTED notices to views that become visible during drag" into honeycomb 2011-01-14 12:36:53 -08:00
Dianne Hackborn
f21ae26935 am d922ae01: Add Holo theme for IMEs.
* commit 'd922ae01ca99a2b6d39a9393f86776a1d10ebd14':
  Add Holo theme for IMEs.
2011-01-14 12:31:59 -08:00
Dianne Hackborn
d922ae01ca Add Holo theme for IMEs.
Also clean up theme selection code to get rid of duplication.

Change-Id: Idf7b21db70ee83fce24756ead877169bd08b77a9
2011-01-14 12:28:23 -08:00
Robert Greenwalt
7b04b1d7ff am 1e02ebd2: Merge "Update network subtypes info so it is current." into honeycomb
* commit '1e02ebd225cfe629a4ab2b98f19e4e08ad97c397':
  Update network subtypes info so it is current.
2011-01-14 12:26:39 -08:00
Robert Greenwalt
1e02ebd225 Merge "Update network subtypes info so it is current." into honeycomb 2011-01-14 12:23:45 -08:00
Kenny Root
5d40fe9c68 Add the {get,set}PackageObbPaths calls to API
Add getPackageObbPaths() and setPackageObbPaths() to the public API.

Bug: 3214719
Change-Id: I8627b5f674a795d5780eb5c08911419110670a41
2011-01-14 12:18:48 -08:00
Adam Powell
25cb8bcd19 am 2dc59d56: Merge "Fix bug 3347747 - Use a better context when fetching resources for action modes" into honeycomb
* commit '2dc59d56cbfe90fdae745496038352fdada6ee26':
  Fix bug 3347747 - Use a better context when fetching resources for action modes
2011-01-14 12:14:24 -08:00
Adam Powell
2dc59d56cb Merge "Fix bug 3347747 - Use a better context when fetching resources for action modes" into honeycomb 2011-01-14 12:12:13 -08:00
Adam Powell
48e8ac311b Fix bug 3347747 - Use a better context when fetching resources for
action modes

Change-Id: I0c6595c290a9d41f673944c127d2e9aaf7dc84ce
2011-01-14 12:10:47 -08:00
satok
b3b1509de7 am 64fc11c3: Merge "Add input methods settings panel" into honeycomb
* commit '64fc11c3ddefc4272a171aaab5c1291709fabe7e':
  Add input methods settings panel
2011-01-14 12:05:09 -08:00
satok
64fc11c3dd Merge "Add input methods settings panel" into honeycomb 2011-01-14 12:03:40 -08:00
satok
82beadfa06 Add input methods settings panel
Bug: 3141466
Bug: 3301559
Bug: 3284424

Moved from old master I4d9abeea

Change-Id: I62fa64cc095e1b9ac34f21e7d4d2e0bb8a3e68fc
2011-01-15 05:00:51 +09:00
Christopher Tate
86cab1bd52 Send DRAG_STARTED notices to views that become visible during drag
We now recognize that a view is now a candidate for receiving the drop
but hasn't yet been notified about it, and send the DRAG_STARTED lifecycle
event properly.  This change also changes the DRAG_ENDED policy: now,
every view that had been sent a DRAG_STARTED receives the corresponding
DRAG_ENDED event, even though subsequent visibility changes may have
occured.

Change-Id: If4ae9ddbf414703e9f15eb2005471626bf19f316
2011-01-14 11:46:09 -08:00
Costin Manolache
660f72a016 am c6684f9e: Fix previous quick fix, LoginOptions is final.
* commit 'c6684f9e9790e92960504e9b32f20f27003d9f37':
  Fix previous quick fix, LoginOptions is final.
2011-01-14 11:29:59 -08:00
Costin Manolache
c6684f9e97 Fix previous quick fix, LoginOptions is final.
Change-Id: I5f262458239378697a67cbd8e83175bf3ffc7f5b
2011-01-14 11:26:25 -08:00
Robert Greenwalt
17415b9292 Update network subtypes info so it is current.
bug:3327895
Change-Id: Ic1e2a5527c651333af50cc5cfa6c44a15b991fb0
2011-01-14 11:23:54 -08:00
Costin Manolache
c405eb6f30 am 05db1af9: Merge "Fix NPE, caller may not pass loginOptions." into honeycomb
* commit '05db1af9bb42b4b2e668aba2dfcd61878a235764':
  Fix NPE, caller may not pass loginOptions.
2011-01-14 10:53:59 -08:00
Costin Manolache
05db1af9bb Merge "Fix NPE, caller may not pass loginOptions." into honeycomb 2011-01-14 10:52:11 -08:00
Costin Manolache
75b8fc7e0c Fix NPE, caller may not pass loginOptions.
Change-Id: Ifb6a8bf876d30a9726f535a90ba8c0719a9a04aa
2011-01-14 10:50:38 -08:00
Justin Ho
ccc68dad99 am 679cd50a: Merge "Updated assets from Gingerbread" into honeycomb
* commit '679cd50aab27235341f1e869af0216366147d6e1':
  Updated assets from Gingerbread
2011-01-14 10:49:49 -08:00
Justin Ho
679cd50aab Merge "Updated assets from Gingerbread" into honeycomb 2011-01-14 10:48:22 -08:00
Justin Ho
724df106a7 Updated assets from Gingerbread
Change-Id: I9beee7ea08325206e1790287901e819893b7239b
2011-01-14 10:47:24 -08:00
Justin Ho
a078224d0a am f80e623b: Merge "Updated stat_notify icons in new style" into honeycomb
* commit 'f80e623be48b630c189e51305c0d203c9f7b8b1f':
  Updated stat_notify icons in new style
2011-01-14 10:40:33 -08:00
Justin Ho
f80e623be4 Merge "Updated stat_notify icons in new style" into honeycomb 2011-01-14 10:38:04 -08:00
Justin Ho
bb2cf771c2 Updated stat_notify icons in new style
Change-Id: I3708aae30805bceb05feb4adfe4a400e1320d0b2
2011-01-14 10:36:27 -08:00
Ben Murdoch
4f6ec58a72 am c69d5f3b: Merge "Hook up CacheManager for the Chromium HTTP stack" into honeycomb
* commit 'c69d5f3b536a56da9120ace34e05b9878ed164c6':
  Hook up CacheManager for the Chromium HTTP stack
2011-01-14 09:41:44 -08:00
Steve Block
e8492473a9 Hook up CacheManager for the Chromium HTTP stack
Requires a corresponding change in external/webkit
https://android-git.corp.google.com/g/87938

Bug: 3270236
Change-Id: Ibb6ee0531bde48d9b069de28f9f22891ca6d0718
2011-01-14 16:07:40 +00:00
Steve Block
39bc608bb1 am 1916e7f3: Adds a new WebViewFragment class
* commit '1916e7f3a341f9b25571ca4bde8ea1d8a22d815a':
  Adds a new WebViewFragment class
2011-01-14 04:36:46 -08:00
Steve Block
1916e7f3a3 Adds a new WebViewFragment class
Cherry pick from master change 85641.

Bug: 3262357
Change-Id: Ife095f7db820bf0a2add682b47586854a4ea9499
2011-01-14 11:44:35 +00:00
Jeff Hamilton
d7b3dde687 Merge "resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-01-13 22:58:08 -08:00
Jeff Hamilton
93ec68e6a9 resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp
Change-Id: Ia7071ca07d917bd79e7697f4b0c0640ebb5f6a6f
2011-01-14 00:38:31 -06:00
Adam Powell
95ad5c54ea am 2421cd42: Merge "Fix bug 3352112 - crash in AbsListView.smoothScrollBy" into honeycomb
* commit '2421cd42292b3593716407847d2957f71c92c1fe':
  Fix bug 3352112 - crash in AbsListView.smoothScrollBy
2011-01-13 22:23:41 -08:00
Adam Powell
2421cd4229 Merge "Fix bug 3352112 - crash in AbsListView.smoothScrollBy" into honeycomb 2011-01-13 22:21:15 -08:00
Adam Powell
79303750df Fix bug 3352112 - crash in AbsListView.smoothScrollBy
Change-Id: I00b4e5855a1c0861993670a38ed2cd946fd18594
2011-01-13 22:06:49 -08:00
Romain Guy
bd04922f8f am 5b907be8: Merge "Move the main thread check to the appropriate place." into honeycomb
* commit '5b907be8f5c387e7580a8e43935250adabc408c8':
  Move the main thread check to the appropriate place.
2011-01-13 18:38:25 -08:00
Romain Guy
5b907be8f5 Merge "Move the main thread check to the appropriate place." into honeycomb 2011-01-13 18:36:13 -08:00
Romain Guy
501053a16d Move the main thread check to the appropriate place.
Change-Id: Ic9bcf209e9398ea05b293a8cc31ac7f234b9de16
2011-01-13 18:38:45 -08:00
Huahui Wu
4809e629a6 am bfbb089c: Merge "b/3133123 Pass touch point ids to WebKit." into honeycomb
* commit 'bfbb089c7fcb2bc74f55fe3c171ef1b6df78b2da':
  b/3133123 Pass touch point ids to WebKit.
2011-01-13 17:04:39 -08:00
Huahui Wu
bfbb089c7f Merge "b/3133123 Pass touch point ids to WebKit." into honeycomb 2011-01-13 17:02:33 -08:00
Huahui Wu
e838a42778 b/3133123 Pass touch point ids to WebKit.
This is the CL in framework side and it needs the WebKit part CL:
  https://android-git.corp.google.com/g/#change,89627

Change-Id: I11d4ffa29fa106d918332e6983090b06726ebd36
2011-01-13 16:47:17 -08:00
Jaikumar Ganesh
5a9fbfe454 am e77e9da8: Merge "Fix bug in handling connect/disconnect multiple devices." into honeycomb
* commit 'e77e9da84946a2833ef8b0d1d476d6325768a244':
  Fix bug in handling connect/disconnect multiple devices.
2011-01-13 16:23:18 -08:00
Jaikumar Ganesh
e77e9da849 Merge "Fix bug in handling connect/disconnect multiple devices." into honeycomb 2011-01-13 16:21:12 -08:00
Brad Fitzpatrick
9af7c8c0f9 am 52ea9898: Merge "Remove accidental StrictMode logging left in." into honeycomb
* commit '52ea989874160be47aad75b285503959c0e4c0bb':
  Remove accidental StrictMode logging left in.
2011-01-13 16:18:51 -08:00
Brad Fitzpatrick
52ea989874 Merge "Remove accidental StrictMode logging left in." into honeycomb 2011-01-13 16:16:46 -08:00
Brad Fitzpatrick
4a82b62044 Remove accidental StrictMode logging left in.
Change-Id: I7580816c6efc32889f49987152ff1d4c40d47140
2011-01-13 16:15:40 -08:00
Jaikumar Ganesh
d1287f5ef0 Fix bug in handling connect/disconnect multiple devices.
Multiple HID devices can be connected. There is no pointing
maintaining the global state. Check individual device state.

Bug: 3350904

Change-Id: I03d9a6015e39e4f9d7f68cc8bbdb19731129b4e6
2011-01-13 15:59:27 -08:00
Dianne Hackborn
b054b4c835 am 8eca7a1e: Merge "Fix issue #3153930: orphan window left on screen" into honeycomb
* commit '8eca7a1e11d905e1d89d4c45adfe210536b5f521':
  Fix issue #3153930: orphan window left on screen
2011-01-13 15:47:58 -08:00