Commit Graph

28628 Commits

Author SHA1 Message Date
Justin Ho
b3401fd605 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
7a6910126d 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
bbbd75cd77 Merge "Removing unused assets in mdpi" into honeycomb 2011-01-25 17:46:23 -08:00
Jim Miller
3f978889ce 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
59e4311635 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
b199599517 Merge "Fix 3338368: Fix bounds calculation for recent apps view" into honeycomb 2011-01-25 17:41:59 -08:00
Guang Zhu
c995525893 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
76e67fc4d4 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
Adam Powell
21d477296e 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
37a1c3a873 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
df4bf54de6 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
602f680eae 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
65b5cb53cf 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
05233d5675 resolved conflicts for merge of f0b7977f to honeycomb-plus-aosp
Change-Id: I6de7a12f0f491f02a6765d1f3fbd28ba3a62bea3
2011-01-25 18:29:11 -06:00
Adam Powell
0310534e1a Merge "Fix bug 3343940 - Legacy dialogs should use overlay action mode UI" into honeycomb 2011-01-25 16:27:16 -08:00
Brad Fitzpatrick
9c925011ff 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
adf8008157 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
463168d4fa 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
528a45e523 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
cfdfca2273 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
eb1c59e8ea 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
10c2760f5b 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
4060c08029 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
Mathias Agopian
11689a64d9 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
07c00287d8 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
Jeff Hamilton
faa9dce087 am 95f7c854: Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '95f7c8549928c0b383b3b3651224ded6b05a2f51':
  Use classnames instead of ints for NFC techs.
2011-01-25 16:21:28 -08:00
Gilles Debunne
03016041d5 am f5c7cbad: am 4df103cf: Merge "A long press on the selection handle no longer selects the word." into honeycomb
* commit 'f5c7cbadd5a7a53e4e8b79aadde5835dfe907ad0':
  A long press on the selection handle no longer selects the word.
2011-01-25 16:21:22 -08:00
Jim Miller
e5951dcbe2 Merge "Fix 3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb 2011-01-25 16:21:21 -08:00
Romain Guy
b64cb58c1a am 14952971: am 5c4c0d50: Merge "Fix documentation typo." into honeycomb
* commit '14952971803e2cd95c201416c7ff3d641d85c0f9':
  Fix documentation typo.
2011-01-25 16:21:04 -08:00
Mike Lockwood
d5435e074d am c80daa1b: am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
* commit 'c80daa1b05b8f1d2873df23821ae2c5344e76fb8':
  StagefrightMediaScanner: Close metadata retriever after we are done scanning
2011-01-25 16:20:56 -08:00
Mike Lockwood
38e42f4329 am 7fadb5e7: am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
* commit '7fadb5e77fd079c3a6c5eeae1ae81a487864b129':
  MTP: Fix race conditions in MtpServer JNI code
2011-01-25 16:20:50 -08:00
James Dong
eff8a0a974 am 45800cf9: am 3115dad3: Merge "Report errors to applications if AudioRecord->start() fails" into honeycomb
* commit '45800cf939d716a6d6435872f5f876b2cfd2689d':
  Report errors to applications if AudioRecord->start() fails
2011-01-25 16:20:34 -08:00
Justin Ho
2530f99c98 am 55a24b7a: am 26faf54d: Merge "New contact picture" into honeycomb
* commit '55a24b7a4e3a6c19efe64737148857c162ea3a1e':
  New contact picture
2011-01-25 16:20:26 -08:00
Dianne Hackborn
1157cc0e9a am a58552e0: am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb
* commit 'a58552e03de2f24aef735e94fcfab12a0078a3b3':
  Argh forget to include my final part of the change.
2011-01-25 16:20:16 -08:00
Dianne Hackborn
110d6844e3 am 1a904ded: am 8fca2ecc: Merge "New extra for GET_CONTENT." into honeycomb
* commit '1a904dedbb5a15b3e60cac0fab83a3734701aff6':
  New extra for GET_CONTENT.
2011-01-25 16:19:48 -08:00
Adam Powell
7a70a61928 am e0c14848: am 5dcc9bd7: Merge "Fix bug 3387855 - Menu flashes on left side of screen" into honeycomb
* commit 'e0c148484e3855bfa48b5e874ac3a1d2663784dd':
  Fix bug 3387855 - Menu flashes on left side of screen
2011-01-25 16:19:25 -08:00
Santosh Madhava
753416fbc5 am d6451721: am 1c9ac916: Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb
* commit 'd645172123f6aac530986ede22fae13f647ccb9f':
  Fix for issue 3385068 : Play gets out of sync
2011-01-25 16:19:17 -08:00
Scott Main
1006fadd2a am 108841ff: am 31e5c30f: Merge "docs: revise and amend platform notes for preview" into honeycomb
* commit '108841ff943a592702698ca17ccfe7d2ce2798ed':
  docs: revise and amend platform notes for preview
2011-01-25 16:19:09 -08:00
Jeff Brown
b0db291415 am 391ef42c: am 3168a137: Merge "Fix surface frame size reporting." into honeycomb
* commit '391ef42c92ab97e5c22a720973790696d30576ca':
  Fix surface frame size reporting.
2011-01-25 16:18:59 -08:00
Gilles Debunne
8e24b1cc7d am 7a417821: am 47fc854a: Merge "Fix for a call to startActivity from outside of an app." into honeycomb
* commit '7a417821957bac70bfd4cb4a357b143a1a1570e3':
  Fix for a call to startActivity from outside of an app.
2011-01-25 16:18:51 -08:00
Jeff Hamilton
f207453940 am c33acae9: Merge "Fix the build, proper current.xml." into gingerbread
* commit 'c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
  Fix the build, proper current.xml.
2011-01-25 16:15:58 -08:00
Costin Manolache
809c1325e8 am b324911b: Merge "If \'customTokens\', let authenticator handle notification." into honeycomb
* commit 'b324911b473d20d10c0107273721791bc8b04568':
  If 'customTokens', let authenticator handle notification.
2011-01-25 16:14:42 -08:00
Costin Manolache
b4a4dfc71c Merge "If 'customTokens', let authenticator handle notification." into honeycomb 2011-01-25 16:13:12 -08:00
Jeff Hamilton
1b9429f227 Merge "Fix the build, proper current.xml." into gingerbread 2011-01-25 16:11:37 -08:00
Xavier Ducrohet
0613d09786 am cf2b9ca1: Merge "LayoutLib: return ViewInfo for all merged items + Build init." into honeycomb
* commit 'cf2b9ca11ab493728fe75c1ffcd6bc2e273e1d55':
  LayoutLib: return ViewInfo for all merged items + Build init.
2011-01-25 16:10:17 -08:00
Xavier Ducrohet
bbdc56d266 Merge "LayoutLib: return ViewInfo for all merged items + Build init." into honeycomb 2011-01-25 16:08:03 -08:00
Mathias Agopian
71d9ee54e5 am df836892: (-s ours) am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit 'df8368925acd4593a309e06548d7f900bf8d94df':
  fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
2011-01-25 16:04:48 -08:00
Mathias Agopian
504097e622 am af4fa5d8: (-s ours) am 1955a5c9: Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
* commit 'af4fa5d83d70a9af9ede67c47eae72d1db0d6d74':
  partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
2011-01-25 16:04:44 -08:00
Mathias Agopian
dd70836806 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 '6b72702f305cf3aad80ed6e9f962280be745b588':
  fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
2011-01-25 16:04:39 -08:00
Mathias Agopian
9c77314879 am 2d665dd3: (-s ours) am 043a3cdd: Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '2d665dd37a6677a1e8f3f753e1656780286cfa29':
  workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
2011-01-25 16:04:33 -08:00