Adam Powell
8722fba3a3
am 5a6bb13a: am c5573a5a: Merge "Fix button assets and styles." into honeycomb
...
* commit '5a6bb13a7ac58a0f4a77e588c0bb8b8465f212fe':
Fix button assets and styles.
2011-01-25 18:34:21 -08:00
Adam Powell
5a6bb13a7a
am c5573a5a: Merge "Fix button assets and styles." into honeycomb
...
* commit 'c5573a5ac40d93b4b74608ee1858d04f74cb24f5':
Fix button assets and styles.
2011-01-25 18:32:00 -08:00
Adam Powell
c5573a5ac4
Merge "Fix button assets and styles." into honeycomb
2011-01-25 18:29:09 -08:00
Adam Powell
4f0d85c0cc
Fix button assets and styles.
...
This fixes some padding issues that broke apps during the last update.
Change-Id: Icdce5231f4497f8f0be0ab842a03cbfdfc501c5a
2011-01-25 18:25:20 -08:00
Jeff Brown
41632b9f7d
am 707bf521: (-s ours) am 1b0cee36: Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb
...
* commit '707bf521a4afc71d594c3e433f030bce896834ad':
Disable mouse support. (DO NOT MERGE)
2011-01-25 18:22:55 -08:00
Jeff Brown
ab2f096030
am 12b2dc90: am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycomb
...
* commit '12b2dc90883ef4f930a17907acdef3677b0598a5':
Fix crashes caused by some input devices.
2011-01-25 18:22:50 -08:00
Jeff Brown
707bf521a4
am 1b0cee36: Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb
...
* commit '1b0cee368b35262a8de49c7a3c28e12195817533':
Disable mouse support. (DO NOT MERGE)
2011-01-25 18:20:40 -08:00
Jeff Brown
12b2dc9088
am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycomb
...
* commit 'b1e0a870e4099490127bb917bb4fc7a8f48db893':
Fix crashes caused by some input devices.
2011-01-25 18:20:35 -08:00
Jeff Brown
1b0cee368b
Merge "Disable mouse support. (DO NOT MERGE)" into honeycomb
2011-01-25 18:18:10 -08:00
Jeff Brown
b1e0a870e4
Merge "Fix crashes caused by some input devices." into honeycomb
2011-01-25 18:18:05 -08:00
Justin Ho
d5f16ca78e
Removing unused assets
...
Change-Id: I80b2d559f2bb3511ad8da9391e5f54effe91d837
2011-01-25 18:10:04 -08:00
Mathias Agopian
e1ec077497
am a2852d1f: am f6926a63: Merge "egl: clear error on function entry" into honeycomb
...
* commit 'a2852d1f20f2948dc5cad6a4323836c7f8e1d79b':
egl: clear error on function entry
2011-01-25 18:05:06 -08:00
Mathias Agopian
a2852d1f20
am f6926a63: Merge "egl: clear error on function entry" into honeycomb
...
* commit 'f6926a63dfdc114789a6acc06396ca826eb64418':
egl: clear error on function entry
2011-01-25 18:02:49 -08:00
Mathias Agopian
f6926a63df
Merge "egl: clear error on function entry" into honeycomb
2011-01-25 18:01:03 -08:00
Arnaud Berry
5563104ec8
am 254605c1: am 40f13039: Merge "Fixed the display of the brightness controls in the system panel" into honeycomb
...
* commit '254605c1b02c1fed7470c07bc81a64c89bbdc51d':
Fixed the display of the brightness controls in the system panel
2011-01-25 17:57:21 -08:00
Arnaud Berry
254605c1b0
am 40f13039: Merge "Fixed the display of the brightness controls in the system panel" into honeycomb
...
* commit '40f130398cdfc7bc123c6b8871d77d2398990d5e':
Fixed the display of the brightness controls in the system panel
2011-01-25 17:55:09 -08:00
Jeff Brown
7fe57bfa0d
Disable mouse support. (DO NOT MERGE)
...
Change-Id: Ica9703a18195079d227caff8c2389c750559f3d0
2011-01-25 17:52:01 -08:00
Arnaud Berry
40f130398c
Merge "Fixed the display of the brightness controls in the system panel" into honeycomb
2011-01-25 17:51:32 -08:00
Justin Ho
94552922b2
am d5a9e6af: am 77742fe2: Merge "Removing unused assets in mdpi" into honeycomb
...
* commit 'd5a9e6af132cb88aa7996e7c2bd4827b685c7fd4':
Removing unused assets in mdpi
2011-01-25 17:51:02 -08:00
Justin Ho
d5a9e6af13
am 77742fe2: Merge "Removing unused assets in mdpi" into honeycomb
...
* commit '77742fe284ebed28e53e155c07c5e50e74529dc9':
Removing unused assets in mdpi
2011-01-25 17:48:59 -08:00
Justin Ho
77742fe284
Merge "Removing unused assets in mdpi" into honeycomb
2011-01-25 17:46:23 -08:00
Jim Miller
53fd3bc82f
am 72f4e8f4: am 33f1d078: Merge "Fix 3338368: Fix bounds calculation for recent apps view" into honeycomb
...
* commit '72f4e8f49776658fcbc28a20531b5268fef916aa':
Fix 3338368: Fix bounds calculation for recent apps view
2011-01-25 17:45:38 -08:00
Jim Miller
72f4e8f497
am 33f1d078: Merge "Fix 3338368: Fix bounds calculation for recent apps view" into honeycomb
...
* commit '33f1d0780041d962f911b8908cb4929589f7e4fe':
Fix 3338368: Fix bounds calculation for recent apps view
2011-01-25 17:43:47 -08:00
Jim Miller
33f1d07800
Merge "Fix 3338368: Fix bounds calculation for recent apps view" into honeycomb
2011-01-25 17:41:59 -08:00
Guang Zhu
8cd7861650
am eb84ac4d: am 5794f230: change the way test app waits for gc
...
* commit 'eb84ac4dd97b65f342d640b1763224bb3cdf2256':
change the way test app waits for gc
2011-01-25 17:41:15 -08:00
Guang Zhu
eb84ac4dd9
am 5794f230: change the way test app waits for gc
...
* commit '5794f2302209981c64425ea2b661b17f00b8f808':
change the way test app waits for gc
2011-01-25 17:39:21 -08:00
Jaikumar Ganesh
55b6b862c8
Do Not Merge. Don't connect to non keyboard HID devices.
...
Bug: 3385950
Change-Id: I2cfb17467c3d2fd383747111cd990d39f10f5136
2011-01-25 17:38:11 -08:00
Kenny Root
b7db2726e9
Make OBB results a one-way call
...
OBB result back to an application needs to be a one-way binder call.
Bug: 3353699
Change-Id: I0e625914d18a001c2fa9d764ea6463f34cf96743
2011-01-25 17:29:59 -08:00
Guang Zhu
5794f23022
change the way test app waits for gc
...
gcSoftReferences methods are being obsoleted, so we need a different
approach to wait for gc: create a CountDownLatch and release it in
a dummy object's finalizer, call gc and await on the CDL.
Change-Id: I54d9e6bc05540b16ee1f3959ace9008041ac4903
2011-01-25 17:25:59 -08:00
Adam Cohen
78db1aa911
Cleaning up StackView
...
Change-Id: I38cd8a5f2d25973d3f97551be0a873ca35044ed9
2011-01-25 17:09:34 -08:00
Jim Miller
6f5bd3c3b3
Fix 3338368: Fix bounds calculation for recent apps view
...
The calculation for determine the content view's bounds
was mistakenly using the position of the view in the immediate
parent (glow view), which wrapped it exactly in the vertical
direction. The code now uses the glow view's vertical
position in its parent to determine the position.
Change-Id: I07768eb3446fde851699de1c1d4e958bc16d98bb
2011-01-25 17:03:27 -08:00
Jaikumar Ganesh
c8fa4ff838
Improve readability of java docs for the public APIs.
...
Change-Id: I0a0f1be04ed2ea2c14498a1a2ed4b050191ec95b
2011-01-25 16:53:39 -08:00
Adam Powell
06aca23fa5
am d144b449: am d63219f6: Merge "Fix bug 3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb
...
* commit 'd144b449b1e8f6e41666257d68d4dec37c3d0951':
Fix bug 3343940 - Legacy dialogs should use overlay action mode UI
2011-01-25 16:36:35 -08:00
Jeff Hamilton
4e55fcb7e9
am adb8c2f9: Merge "resolved conflicts for merge of f0b7977f to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit 'adb8c2f970fb9436fa2b7f515e51efcc878ce4e6':
Fix the build, proper current.xml.
2011-01-25 16:34:29 -08:00
Jim Miller
77888deb43
am a497e944: am adc14026: Merge "Fix 3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb
...
* commit 'a497e9448ef2e52db28ba0c400ae3b94ac1b6fc4':
Fix 3381660: Make modifier keys in PasswordUnlock match IME
2011-01-25 16:34:16 -08:00
Adam Powell
d144b449b1
am d63219f6: Merge "Fix bug 3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb
...
* commit 'd63219f62248d067462403bed9e0539df53dd2dd':
Fix bug 3343940 - Legacy dialogs should use overlay action mode UI
2011-01-25 16:34:01 -08:00
Jeff Hamilton
adb8c2f970
Merge "resolved conflicts for merge of f0b7977f to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-25 16:29:48 -08:00
Jeff Hamilton
4405cdbfff
resolved conflicts for merge of f0b7977f to honeycomb-plus-aosp
...
Change-Id: I6de7a12f0f491f02a6765d1f3fbd28ba3a62bea3
2011-01-25 18:29:11 -06:00
Adam Powell
d63219f622
Merge "Fix bug 3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb
2011-01-25 16:27:16 -08:00
Brad Fitzpatrick
821a4aca2b
am 47864180: am 6af61b84: am a206efcf: Merge "android.os.Message: respect sPoolSize"
...
* commit '47864180918702768d26f48ec3213c935cea0c4b':
android.os.Message: respect sPoolSize
2011-01-25 16:25:25 -08:00
Jim Miller
a497e9448e
am adc14026: Merge "Fix 3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb
...
* commit 'adc14026fbd21d5238a47f402c7b316a7aeac92e':
Fix 3381660: Make modifier keys in PasswordUnlock match IME
2011-01-25 16:24:23 -08:00
Costin Manolache
b02ebb654a
am f7f46dda: am b324911b: Merge "If \'customTokens\', let authenticator handle notification." into honeycomb
...
* commit 'f7f46dda1e3391661138242be767ecefc15750d2':
If 'customTokens', let authenticator handle notification.
2011-01-25 16:22:34 -08:00
Xavier Ducrohet
57e2107d7c
am 94243b0e: am cf2b9ca1: Merge "LayoutLib: return ViewInfo for all merged items + Build init." into honeycomb
...
* commit '94243b0e1bfe2cd7d76caf3cb580d53cb9028a18':
LayoutLib: return ViewInfo for all merged items + Build init.
2011-01-25 16:22:18 -08:00
Mathias Agopian
d732ea5f32
am 9392c41b: (-s ours) am df836892: (-s ours) am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
...
* commit '9392c41b99cb136d6c2a058f6bc3ffb83daf5a46':
fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
2011-01-25 16:22:07 -08:00
Mathias Agopian
d383256b89
am a1bed9d1: (-s ours) am af4fa5d8: (-s ours) am 1955a5c9: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
...
* commit 'a1bed9d179c86f89b29f891ecd53da21c4e5a13f':
partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
2011-01-25 16:22:03 -08:00
Mathias Agopian
50174a6099
am 3880726b: (-s ours) am 6b72702f: (-s ours) am d0441f92: Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
...
* commit '3880726b75097ed0bd92ece1275da5e9991df06d':
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
2011-01-25 16:21:59 -08:00
Mathias Agopian
2ea1c38ddb
am 55fb350e: (-s ours) am 2d665dd3: (-s ours) am 043a3cdd: Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
...
* commit '55fb350ef82099c2dd98119735cae10e5eeacfff':
workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
2011-01-25 16:21:54 -08:00
Adam Powell
88dd01c756
Fix bug 3343940 - Legacy dialogs should use overlay action mode UI
...
Change-Id: I0bb2d4cbb0639e01483f1029aa95984d4b29ffc6
2011-01-25 16:21:50 -08:00
Mathias Agopian
328b4d824d
am 166a3d56: (-s ours) am 88bccab3: (-s ours) am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
...
* commit '166a3d56ef3d62036119dcda2881953e487b202f':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
2011-01-25 16:21:47 -08:00
Brad Fitzpatrick
4786418091
am 6af61b84: am a206efcf: Merge "android.os.Message: respect sPoolSize"
...
* commit '6af61b843511bc5b669d30b980c4a9e2682da47c':
android.os.Message: respect sPoolSize
2011-01-25 16:21:29 -08:00