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

39847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
002fa80d1a am 84543705: Merge "Fix issue #3330037: Unnecessary orientations appear..." into honeycomb 
* commit '84543705138ed67494b9ecd64fadf4ab0bf46a0e':
  Fix issue #3330037: Unnecessary orientations appear...
 2011-01-13 21:15:56 -08:00
Dianne Hackborn
8454370513 Merge "Fix issue #3330037: Unnecessary orientations appear..." into honeycomb 2011-01-13 21:14:12 -08:00
Dianne Hackborn
94cb2ebfc3 Fix issue #3330037: Unnecessary orientations appear... 
...when the device's physical orientation is portrait.

We now hold off on computing app token orientation while preparing
to open or close app tokens.

Also clean up a few other little issues.

Change-Id: Iae125a975c7706fb4d068c872fd172e69854ff15
 2011-01-13 21:11:09 -08:00
Jeff Brown
4f7a2d45f4 am 370f01bd: Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb 
* commit '370f01bd42377dc1b150fa09515c4871ab763698':
  Fix NPE in interceptKeyBeforeDispatching.
 2011-01-13 20:02:35 -08:00
Jeff Brown
370f01bd42 Merge "Fix NPE in interceptKeyBeforeDispatching." into honeycomb 2011-01-13 20:00:31 -08:00
Jeff Brown
00ae87d4fd Fix NPE in interceptKeyBeforeDispatching. 
Bug: 3349786
Change-Id: Ic2f969ff8a654fdcfeca06199acca531ae5596d3
 2011-01-13 19:58:24 -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
Xavier Ducrohet
2991b37e99 am 428a731d: Merge "LayoutLib: Fix multi-line text rendering." into honeycomb 
* commit '428a731db9a2e5bb273f122cc103ec32ad802f90':
  LayoutLib: Fix multi-line text rendering.
 2011-01-13 18:32:10 -08:00
Xavier Ducrohet
428a731db9 Merge "LayoutLib: Fix multi-line text rendering." into honeycomb 2011-01-13 18:30:04 -08:00
Xavier Ducrohet
bbefc8662a LayoutLib: Fix multi-line text rendering. 
Stupid indices.

Change-Id: I1dbdd04b8f25a5769de8dc21e6c513cef3e35635
 2011-01-13 18:02:08 -08:00
Romain Guy
1e3a431d07 Remove debug code 
Change-Id: Idbc54d16adb4d86185d7196ea0297b5019d14ae4
 2011-01-13 17:47:15 -08:00
Romain Guy
c8b30a3e56 am 24bb317f: Merge "Remove debug code" into honeycomb 
* commit '24bb317fe260300d03be42dcdd9aab210fbed45b':
  Remove debug code
 2011-01-13 17:46:37 -08:00
Romain Guy
24bb317fe2 Merge "Remove debug code" into honeycomb 2011-01-13 17:44:28 -08:00
Jason Sams
290f4136ca am e9d3da13: Merge "Re-implement img npot support in HC." into honeycomb 
* commit 'e9d3da1374a4ce06610675f1f9b578b62fc23449':
  Re-implement img npot support in HC.
 2011-01-13 17:24:12 -08:00
Romain Guy
ffac7fc504 Add debug logs for display lists. 
Change-Id: I7bae8fd96e9eccb51f29f73e4069b4d3e6bdbdd7
 2011-01-13 17:22:58 -08:00
Romain Guy
fd160239a1 am 7f5690bb: Merge "Add debug logs for display lists." into honeycomb 
* commit '7f5690bb1089980a73ad5d6dea2177cb74e8c9e7':
  Add debug logs for display lists.
 2011-01-13 17:22:06 -08:00
Jason Sams
e9d3da1374 Merge "Re-implement img npot support in HC." into honeycomb 2011-01-13 17:21:02 -08:00
Romain Guy
7f5690bb10 Merge "Add debug logs for display lists." into honeycomb 2011-01-13 17:20:47 -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
Jason Sams
9333e64f79 Re-implement img npot support in HC. 
Change-Id: Iac56ec54e46c998ec14f71d8e85eccdc5fb3aa91
 2011-01-13 17:02:35 -08:00
Huahui Wu
bfbb089c7f Merge "b/3133123 Pass touch point ids to WebKit." into honeycomb 2011-01-13 17:02:33 -08:00
Kenny Root
ce2fb18942 am 402438bb: Merge "Deep clone settings for system package update" into honeycomb 
* commit '402438bb40795a3608509f40bcff6245698185ad':
  Deep clone settings for system package update
 2011-01-13 16:57:31 -08:00
Kenny Root
402438bb40 Merge "Deep clone settings for system package update" into honeycomb 2011-01-13 16:55:00 -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
Alex Sakhartchouk
037a3b575a am 49dc58bf: Merge "Docs plus removing some junk per API review." into honeycomb 
* commit '49dc58bf1cb6ed971899cd8a9d43174723b14dcf':
  Docs plus removing some junk per API review.
 2011-01-13 16:29:14 -08:00
Alex Sakhartchouk
49dc58bf1c Merge "Docs plus removing some junk per API review." into honeycomb 2011-01-13 16:27:23 -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
Kenny Root
291e78cc9c Deep clone settings for system package update 
The copyFrom() method was not written to create a clone of the
PackageSetting, so just create a new constructor that actually does a
clone.

Bug: 3349588
Change-Id: I61864869154340420f005cd5120cad751de30ee8
 2011-01-13 16:17:50 -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
Dianne Hackborn
8eca7a1e11 Merge "Fix issue #3153930: orphan window left on screen" into honeycomb 2011-01-13 15:45:37 -08:00
Guang Zhu
0055a182a6 am 2c037d14: Merge "remove runFinalizationSync calls" into honeycomb 
* commit '2c037d14b8dab0d863c7d380216316d03caaefc3':
  remove runFinalizationSync calls
 2011-01-13 15:40:31 -08:00
Guang Zhu
2c037d14b8 Merge "remove runFinalizationSync calls" into honeycomb 2011-01-13 15:38:44 -08:00
Guang Zhu
e88255df39 remove runFinalizationSync calls 
according to csharpiro, these calls are unnecessary and may
lead to problems.

bug: 3350034

Change-Id: I25a80e4e7610901e75622334bf97d6c1bed17cbd
 2011-01-13 15:37:43 -08:00
Gilles Debunne
2cf2b0c84c am 783e6c8b: Merge "fix for cts DuplicateParentStateEnabled bug with TextViews." into honeycomb 
* commit '783e6c8b3ba7eecac3bdd796b53a1293f9cb1be4':
  fix for cts DuplicateParentStateEnabled bug with TextViews.
 2011-01-13 14:54:45 -08:00
Adam Powell
2aadcd78f4 am 379a51d9: Merge "Fix bug 3242262 - Add queryHint attribute for SearchView" into honeycomb 
* commit '379a51d96f1dc9db2dcc3288d536594c32f4b514':
  Fix bug 3242262 - Add queryHint attribute for SearchView
 2011-01-13 14:54:32 -08:00
Alex Sakhartchouk
f5c876e82d Docs plus removing some junk per API review. 
Change-Id: I45f995b656754550be68c78e467071d6e59b348f
 2011-01-13 14:53:43 -08:00
Gilles Debunne
783e6c8b3b Merge "fix for cts DuplicateParentStateEnabled bug with TextViews." into honeycomb 2011-01-13 14:51:33 -08:00
Adam Powell
379a51d96f Merge "Fix bug 3242262 - Add queryHint attribute for SearchView" into honeycomb 2011-01-13 14:51:16 -08:00