git.osdn.net Git - android-x86/frameworks-native.git/log

(root) / android-x86 / frameworks-native.git / log

Dianne Hackborn [Thu, 3 Nov 2011 05:37:43 +0000 (05:37 +0000)]

am 92049f1d: am 17bd9a22: Merge "More performance work:" into ics-mr1

* commit '92049f1d3e0367f817233a1f8217263e6aa43c8c':
More performance work:

commit | commitdiff | tree

Dianne Hackborn [Thu, 3 Nov 2011 05:35:21 +0000 (05:35 +0000)]

am 17bd9a22: Merge "More performance work:" into ics-mr1

* commit '17bd9a22ec993fc9eba060950bc5cecd1e06ffb1':
More performance work:

commit | commitdiff | tree

Dianne Hackborn [Thu, 3 Nov 2011 05:31:19 +0000 (22:31 -0700)]

Merge "More performance work:" into ics-mr1

commit | commitdiff | tree

Eric Fischer [Thu, 3 Nov 2011 00:45:47 +0000 (00:45 +0000)]

am 30cddfe5: am c37f98ea: (-s ours) am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0

* commit '30cddfe5e1e80059b87d3de72a8a6adfeb6f37fd':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Katie McCormick [Thu, 3 Nov 2011 00:45:46 +0000 (00:45 +0000)]

am ceac0ecd: am f2158d08: am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0

* commit 'ceac0ecd1202aa736d7eed09ab4f84dd4f2ae1ca':
Doc change: Update instructions to match ICS UI

commit | commitdiff | tree

Katie McCormick [Thu, 3 Nov 2011 00:45:44 +0000 (00:45 +0000)]

am 44730971: am 31a05f33: Doc change: Update instructions to match ICS UI

* commit '4473097193a853edf3c63ba0a62d1d763a8b4379':
Doc change: Update instructions to match ICS UI

commit | commitdiff | tree

Eric Fischer [Thu, 3 Nov 2011 00:43:11 +0000 (00:43 +0000)]

am c37f98ea: (-s ours) am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0

* commit 'c37f98eab3d6e63f71b1600ea0e4355c6503384b':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Katie McCormick [Thu, 3 Nov 2011 00:43:09 +0000 (00:43 +0000)]

am f2158d08: am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0

* commit 'f2158d0820ca6c243fd807224c7e8ebb96cd8d2b':
Doc change: Update instructions to match ICS UI

commit | commitdiff | tree

Katie McCormick [Thu, 3 Nov 2011 00:43:08 +0000 (00:43 +0000)]

am 31a05f33: Doc change: Update instructions to match ICS UI

* commit '31a05f336ac99ab4ecfb5e227aca40f8fc7140cb':
Doc change: Update instructions to match ICS UI

commit | commitdiff | tree

Eric Fischer [Thu, 3 Nov 2011 00:04:10 +0000 (00:04 +0000)]

am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0

* commit '8c49b81b5971c3fd254c4ecd862d1a32b1917edb':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Katie McCormick [Thu, 3 Nov 2011 00:04:09 +0000 (00:04 +0000)]

am e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0

* commit 'e08be659eba742d117d24f642a95ba65e13bd015':
Doc change: Update instructions to match ICS UI

commit | commitdiff | tree

Eric Fischer [Wed, 2 Nov 2011 23:17:03 +0000 (16:17 -0700)]

Merge "Import revised translations. DO NOT MERGE" into ics-mr0

commit | commitdiff | tree

Adam Powell [Wed, 2 Nov 2011 22:49:32 +0000 (22:49 +0000)]

am e40b7136: am b41d9f8a: Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1

* commit 'e40b7136bf2718286482d15c410e43827f4dac91':
Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled

commit | commitdiff | tree

Adam Powell [Wed, 2 Nov 2011 22:47:42 +0000 (22:47 +0000)]

am b41d9f8a: Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1

* commit 'b41d9f8a84a325241440b6e950dea6d240134823':
Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled

commit | commitdiff | tree

Adam Powell [Wed, 2 Nov 2011 22:44:31 +0000 (15:44 -0700)]

Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1

commit | commitdiff | tree

Katie McCormick [Wed, 2 Nov 2011 22:42:18 +0000 (15:42 -0700)]

Merge "Doc change: Update instructions to match ICS UI" into ics-mr0

commit | commitdiff | tree

Irfan Sheriff [Wed, 2 Nov 2011 21:44:57 +0000 (21:44 +0000)]

am 05c6756b: am b419abca: am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0

* commit '05c6756b5e3159fea91a1845c9fe7ff8ecf1228e':
Avoid duplicate dialogs leading to NPE

commit | commitdiff | tree

Irfan Sheriff [Wed, 2 Nov 2011 21:42:49 +0000 (21:42 +0000)]

am b419abca: am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0

* commit 'b419abcadad79cd908acfe51dc6e8902c16ff728':
Avoid duplicate dialogs leading to NPE

commit | commitdiff | tree

Irfan Sheriff [Wed, 2 Nov 2011 21:38:55 +0000 (21:38 +0000)]

am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0

* commit '7f00c22b7fa7b38b644585c0a3c6faadc5def94c':
Avoid duplicate dialogs leading to NPE

commit | commitdiff | tree

Irfan Sheriff [Wed, 2 Nov 2011 21:37:19 +0000 (14:37 -0700)]

Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0

commit | commitdiff | tree

Robert Greenwalt [Wed, 2 Nov 2011 21:35:43 +0000 (21:35 +0000)]

am 45ded486: am 4a113251: am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0

* commit '45ded486211d7811d1003f19fd8aa27d40578c3b':
Ignore errors when untethering

commit | commitdiff | tree

Robert Greenwalt [Wed, 2 Nov 2011 21:32:26 +0000 (21:32 +0000)]

am 4a113251: am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0

* commit '4a113251078ad028d1a071ebf5562185275c7039':
Ignore errors when untethering

commit | commitdiff | tree

Robert Greenwalt [Wed, 2 Nov 2011 21:28:33 +0000 (21:28 +0000)]

am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0

* commit '451fa13e82ea1226895b41282fdb33bf9fea5d19':
Ignore errors when untethering

commit | commitdiff | tree

Robert Greenwalt [Wed, 2 Nov 2011 21:26:45 +0000 (14:26 -0700)]

Merge "Ignore errors when untethering" into ics-mr0

commit | commitdiff | tree

Eric Fischer [Wed, 2 Nov 2011 21:18:46 +0000 (21:18 +0000)]

am 3138e219: Merge "Import revised translations."

* commit '3138e2193594f976f4a6c8977f46552ee7f08d67':
Import revised translations.

commit | commitdiff | tree

Eric Fischer [Wed, 2 Nov 2011 21:16:29 +0000 (14:16 -0700)]

Merge "Import revised translations."

commit | commitdiff | tree

Tor Norbye [Wed, 2 Nov 2011 20:04:34 +0000 (20:04 +0000)]

am 333dd796: Merge "Set theme-tag in render log when failing to find style"

* commit '333dd79622e1f3f3f4c98a42f3e38c6a17b4a91a':
Set theme-tag in render log when failing to find style

commit | commitdiff | tree

Tor Norbye [Wed, 2 Nov 2011 19:48:25 +0000 (12:48 -0700)]

Merge "Set theme-tag in render log when failing to find style"

commit | commitdiff | tree

Scott Main [Wed, 2 Nov 2011 19:16:31 +0000 (19:16 +0000)]

am 21119270: am 42774dec: am aea8d850: docs: a couple typos bugs 5552478 5553096

* commit '211192703600332701a692393e18dddfc486e807':
docs: a couple typos bugs 5552478 5553096

commit | commitdiff | tree

Scott Main [Wed, 2 Nov 2011 19:14:48 +0000 (19:14 +0000)]

am 42774dec: am aea8d850: docs: a couple typos bugs 5552478 5553096

* commit '42774decd903d0bbd1c57c9aa829719f2a683231':
docs: a couple typos bugs 5552478 5553096

commit | commitdiff | tree

Scott Main [Wed, 2 Nov 2011 19:10:21 +0000 (19:10 +0000)]

am aea8d850: docs: a couple typos bugs 5552478 5553096

* commit 'aea8d8500395f7e7dce3f670933f7aaf02be7b11':
docs: a couple typos bugs 5552478 5553096

commit | commitdiff | tree

Svetoslav Ganov [Wed, 2 Nov 2011 18:57:44 +0000 (18:57 +0000)]

am 7899c51f: am 1997fe14: Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1

* commit '7899c51f96b2e392048c0082f14439c9e973a0c3':
Update KeyBoardView to reflect the interaction model in Latin IME

commit | commitdiff | tree

Svetoslav Ganov [Wed, 2 Nov 2011 18:55:44 +0000 (18:55 +0000)]

am 1997fe14: Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1

* commit '1997fe1482ecf1ca920c7729a1ad9df5340565f3':
Update KeyBoardView to reflect the interaction model in Latin IME

commit | commitdiff | tree

Peter Ng [Wed, 2 Nov 2011 18:53:55 +0000 (18:53 +0000)]

am 9f360fde: am 779c1b85: Merge "Make the notification panel header opaque." into ics-mr1

* commit '9f360fde2669934d3420cd45545c80b6ff0c10b0':
Make the notification panel header opaque.

commit | commitdiff | tree

Peter Ng [Wed, 2 Nov 2011 18:53:54 +0000 (18:53 +0000)]

am dc36d929: am c7dbfc64: Merge "making slide unlock on tablet have a larger radius" into ics-mr1

* commit 'dc36d92964338c951544224bb5075379e4b34a03':
making slide unlock on tablet have a larger radius

commit | commitdiff | tree

Svetoslav Ganov [Wed, 2 Nov 2011 18:51:58 +0000 (11:51 -0700)]

Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1

commit | commitdiff | tree

Amith Yamasani [Wed, 2 Nov 2011 18:51:33 +0000 (18:51 +0000)]

am c76e5669: am dab15d14: Merge "Don\'t expand the SearchView if already expanded." into ics-mr1

* commit 'c76e5669883a497781f76e546dc2cdfac18df4e4':
Don't expand the SearchView if already expanded.

commit | commitdiff | tree

Peter Ng [Wed, 2 Nov 2011 18:50:06 +0000 (18:50 +0000)]

am 779c1b85: Merge "Make the notification panel header opaque." into ics-mr1

* commit '779c1b8507d939bd3bd6d3e758ded095d91bcd6f':
Make the notification panel header opaque.

commit | commitdiff | tree

Peter Ng [Wed, 2 Nov 2011 18:50:03 +0000 (18:50 +0000)]

am c7dbfc64: Merge "making slide unlock on tablet have a larger radius" into ics-mr1

* commit 'c7dbfc640bcbc6a238068742aeaa76473e56037e':
making slide unlock on tablet have a larger radius

commit | commitdiff | tree

Amith Yamasani [Wed, 2 Nov 2011 18:47:51 +0000 (18:47 +0000)]

am dab15d14: Merge "Don\'t expand the SearchView if already expanded." into ics-mr1

* commit 'dab15d14ca2ce9c3a614e97869824c6337e76d51':
Don't expand the SearchView if already expanded.

commit | commitdiff | tree

Peter Ng [Wed, 2 Nov 2011 18:47:04 +0000 (11:47 -0700)]

Merge "Make the notification panel header opaque." into ics-mr1

commit | commitdiff | tree

Peter Ng [Wed, 2 Nov 2011 18:46:32 +0000 (11:46 -0700)]

Merge "making slide unlock on tablet have a larger radius" into ics-mr1

commit | commitdiff | tree

Amith Yamasani [Wed, 2 Nov 2011 18:43:53 +0000 (11:43 -0700)]

Merge "Don't expand the SearchView if already expanded." into ics-mr1

commit | commitdiff | tree

The Android Open Source Project [Wed, 2 Nov 2011 18:02:29 +0000 (18:02 +0000)]

am c89d5279: am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit 'c89d527996f16bb8f14884cc0935555fffc0789c':
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
  Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
  Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"

commit | commitdiff | tree

The Android Open Source Project [Wed, 2 Nov 2011 17:59:05 +0000 (17:59 +0000)]

am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit '11b49ba933bab7ff8262139141eef0e5f3c45a18':
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
  Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
  Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"

commit | commitdiff | tree

Adam Powell [Wed, 2 Nov 2011 17:58:56 +0000 (17:58 +0000)]

am 8d317b5b: am 7a5a50c1: Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1

* commit '8d317b5be8959462a6acc889ade95b338ce7a442':
Bug 5513073 - IllegalArgumentException: View not attached to window manager

commit | commitdiff | tree

Svetoslav Ganov [Wed, 2 Nov 2011 17:58:36 +0000 (17:58 +0000)]

am d10b0041: am e5d0f199: Merge "CalendarView title incorrectly updated for different languages." into ics-mr1

* commit 'd10b004116a3fdb4a9b388afea5a3214fb1f2ac5':
CalendarView title incorrectly updated for different languages.

commit | commitdiff | tree

Svetoslav Ganov [Wed, 2 Nov 2011 17:58:32 +0000 (17:58 +0000)]

am 4b6de4f5: am 6e42470f: Merge "Accessibility window query APIs should respect root name space." into ics-mr1

* commit '4b6de4f5a9c2fa08a86b516a49dea97a56e3ce05':
Accessibility window query APIs should respect root name space.

commit | commitdiff | tree

Svetoslav Ganov [Wed, 2 Nov 2011 17:58:31 +0000 (17:58 +0000)]

am 9c257273: am 7f0c850b: Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1

* commit '9c2572730614364a29b5e10c0a3f6ed769fce121':
Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes.

commit | commitdiff | tree

Irfan Sheriff [Wed, 2 Nov 2011 17:58:29 +0000 (17:58 +0000)]

am 339590d9: am f9d8faf7: am 953005e8: Merge "Specify component name for provisioning" into ics-mr0

* commit '339590d97e8c77d72bb4cfb3d64ab6989bdb5df4':
Specify component name for provisioning

commit | commitdiff | tree

Jeff Sharkey [Wed, 2 Nov 2011 17:58:28 +0000 (17:58 +0000)]

am 1a9fedf4: am 9427d688: am db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0

* commit '1a9fedf4978855947c73aa2a87017b60c6f18348':
Process AMS events in NetworkPolicy handler.

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Nov 2011 17:58:27 +0000 (17:58 +0000)]

am 8f3818c7: am 39cec406: Merge "Add new OOM adjustment for the "previous" process." into ics-mr1

* commit '8f3818c71cdfee1fb8c410fd218585d1c4e08d73':
Add new OOM adjustment for the "previous" process.

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 2 Nov 2011 17:58:25 +0000 (17:58 +0000)]

am 4f4b83c5: am 07b4b314: am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"

* commit '4f4b83c50c67d4520af3d5b4733b1627208275ce':
Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Nov 2011 17:58:24 +0000 (17:58 +0000)]

am cf3b3170: am ad41a94b: Merge "Some optimizations." into ics-mr1

* commit 'cf3b31704ae7743ca85219bca9698adcf6fbc67a':
Some optimizations.

commit | commitdiff | tree

Adam Powell [Wed, 2 Nov 2011 17:58:22 +0000 (17:58 +0000)]

am 55720151: am 2eca6133: Merge "Fix bug 5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on" into ics-mr1

* commit '5572015109ab1625925d1bfe2bf0e412eeeb117f':
Fix bug 5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on

commit | commitdiff | tree

Adam Powell [Wed, 2 Nov 2011 17:54:36 +0000 (17:54 +0000)]

am 7a5a50c1: Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1

* commit '7a5a50c12f6a6e094d1e8aa7514df37f1176354a':
Bug 5513073 - IllegalArgumentException: View not attached to window manager

commit | commitdiff | tree

The Android Open Source Project [Wed, 2 Nov 2011 17:52:48 +0000 (10:52 -0700)]

Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001

commit | commitdiff | tree

Katie McCormick [Wed, 2 Nov 2011 17:52:44 +0000 (17:52 +0000)]

am 725e37af: am 46a10ee0: am d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0

* commit '725e37af10e2feff186f7cf75156d77d456e291f':
Doc Update: Update list of widget classes

commit | commitdiff | tree

Svetoslav Ganov [Wed, 2 Nov 2011 17:50:50 +0000 (17:50 +0000)]

am e5d0f199: Merge "CalendarView title incorrectly updated for different languages." into ics-mr1

* commit 'e5d0f19953189fdd0e2661ebb7f0ea925f14ea13':
CalendarView title incorrectly updated for different languages.

commit | commitdiff | tree

Svetoslav Ganov [Wed, 2 Nov 2011 17:50:48 +0000 (17:50 +0000)]

am 6e42470f: Merge "Accessibility window query APIs should respect root name space." into ics-mr1

* commit '6e42470f928bbf60c9fd3d17a2a69a4b96cec170':
Accessibility window query APIs should respect root name space.

commit | commitdiff | tree

Svetoslav Ganov [Wed, 2 Nov 2011 17:50:46 +0000 (17:50 +0000)]

am 7f0c850b: Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1

* commit '7f0c850b7a4a2b8a135a110a33d053f4d6689559':
Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes.

commit | commitdiff | tree

Irfan Sheriff [Wed, 2 Nov 2011 17:50:27 +0000 (17:50 +0000)]

am f9d8faf7: am 953005e8: Merge "Specify component name for provisioning" into ics-mr0

* commit 'f9d8faf7fe9d23bddf4d8d039805bce806e9b9c6':
Specify component name for provisioning

commit | commitdiff | tree

Jeff Sharkey [Wed, 2 Nov 2011 17:50:25 +0000 (17:50 +0000)]

am 9427d688: am db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0

* commit '9427d688bda2d5b177112a58dcfdbcdfdfe98559':
Process AMS events in NetworkPolicy handler.

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Nov 2011 17:50:23 +0000 (17:50 +0000)]

am 39cec406: Merge "Add new OOM adjustment for the "previous" process." into ics-mr1

* commit '39cec40697ab3d1d106e0c0c21458b2085c96f00':
Add new OOM adjustment for the "previous" process.

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 2 Nov 2011 17:50:18 +0000 (17:50 +0000)]

am 07b4b314: am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"

* commit '07b4b3145333bc8ece9fdbb68ade726b3d6485cd':
Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Nov 2011 17:50:14 +0000 (17:50 +0000)]

am ad41a94b: Merge "Some optimizations." into ics-mr1

* commit 'ad41a94b298f834e13632ee29b27cefd75f10012':
Some optimizations.

commit | commitdiff | tree

Adam Powell [Wed, 2 Nov 2011 17:50:12 +0000 (17:50 +0000)]

am 2eca6133: Merge "Fix bug 5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on" into ics-mr1

* commit '2eca6133b69db0a649b8429dcef4ed46b209bf41':
Fix bug 5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on

commit | commitdiff | tree

Dima Zavin [Wed, 2 Nov 2011 17:49:17 +0000 (17:49 +0000)]

am 17e25155: am a9656df5: am f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0

* commit '17e25155c01f5474b5ba7da4c6e0f772eee81b84':
BatteryService(jni): properly handle read's return value

commit | commitdiff | tree

The Android Open Source Project [Wed, 2 Nov 2011 17:49:15 +0000 (17:49 +0000)]

am 86f4e38a: am a0d5bece: Reconcile with ics-mr0-release

* commit '86f4e38a08a58eab503887d51ec048c313f838ac':

commit | commitdiff | tree

Mangesh Ghiware [Wed, 2 Nov 2011 17:49:14 +0000 (17:49 +0000)]

am 634fe989: am 274133df: Merge "Fix setInitialScale() to take display density into account." into ics-mr1

* commit '634fe989853548d7de28c385151f623a1a912931':
Fix setInitialScale() to take display density into account.

commit | commitdiff | tree

Eric Fischer [Wed, 2 Nov 2011 17:49:12 +0000 (17:49 +0000)]

am 2d55e683: (-s ours) am abf75396: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '2d55e683d5dc5d48d8d34f09bfba4d02741e56d9':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Michael Jurka [Wed, 2 Nov 2011 17:49:11 +0000 (17:49 +0000)]

am 0a698228: am 93430b3c: Merge "Fix: never show recents over lock screen" into ics-mr1

* commit '0a698228e69fc0a393a384a4c3a3a873a452428c':
Fix: never show recents over lock screen

commit | commitdiff | tree

Peter Ng [Wed, 2 Nov 2011 17:49:09 +0000 (17:49 +0000)]

am 27e7f797: am 80c3c87f: Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1

* commit '27e7f797c01a2be9316a977557f49e0379429d3a':
Asset updates for tablet notifications and layout fixes to quicksettings

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 2 Nov 2011 17:49:08 +0000 (17:49 +0000)]

am 8fa25162: (-s ours) am 3b8d33b1: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1

* commit '8fa25162a5a3b30cf2c7576daec9e7618957a64e':
Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE

commit | commitdiff | tree

Robert Greenwalt [Wed, 2 Nov 2011 17:49:07 +0000 (17:49 +0000)]

am 380f763e: am 852d72b2: am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0

* commit '380f763e530249bde23cff5a05887e6a9a4764a5':
Add cdma_rmnet4 to list of monitored interfaces

commit | commitdiff | tree

Daniel Sandler [Wed, 2 Nov 2011 17:49:05 +0000 (17:49 +0000)]

am f7250d75: am 7775f52e: Merge "Bring timestamps back to notifications." into ics-mr1

* commit 'f7250d75ce845be0e61d977a96a0fc6b15b29ed1':
Bring timestamps back to notifications.

commit | commitdiff | tree

Jim Miller [Wed, 2 Nov 2011 17:49:03 +0000 (17:49 +0000)]

am 3b1ead9b: am a67217c3: Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1

* commit '3b1ead9b7a7e18e80401d5e5ce8ad7ac98986020':
Fix 5404916: Make layout fit on 480x800 hdpi device

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 2 Nov 2011 17:49:01 +0000 (17:49 +0000)]

am 31cbaca5: (-s ours) am deb15704: (-s ours) am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0

* commit '31cbaca5f6f9c1eefa2cc21935b71cf6abd30ca1':
Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE

commit | commitdiff | tree

Katie McCormick [Wed, 2 Nov 2011 17:42:41 +0000 (17:42 +0000)]

am 46a10ee0: am d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0

* commit '46a10ee08d0e51c97923c8e3c54513d228b42467':
Doc Update: Update list of widget classes

commit | commitdiff | tree

Adam Powell [Wed, 2 Nov 2011 17:33:52 +0000 (10:33 -0700)]

Merge "Bug 5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1

commit | commitdiff | tree

Dima Zavin [Wed, 2 Nov 2011 17:31:47 +0000 (17:31 +0000)]

am a9656df5: am f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0

* commit 'a9656df58f75946f3eab4dd660df56c9d878a04e':
BatteryService(jni): properly handle read's return value

commit | commitdiff | tree

The Android Open Source Project [Wed, 2 Nov 2011 17:31:43 +0000 (17:31 +0000)]

am a0d5bece: Reconcile with ics-mr0-release

* commit 'a0d5bece38f3b8fb430f3fb996e7baefb78d8602':

commit | commitdiff | tree

Mangesh Ghiware [Wed, 2 Nov 2011 17:31:38 +0000 (17:31 +0000)]

am 274133df: Merge "Fix setInitialScale() to take display density into account." into ics-mr1

* commit '274133dfef84f93de349fcd34919f4df32279e8a':
Fix setInitialScale() to take display density into account.

commit | commitdiff | tree

Eric Fischer [Wed, 2 Nov 2011 17:31:35 +0000 (17:31 +0000)]

am abf75396: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit 'abf7539642a7c3d8d31c1d12d705b54cf155db1a':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Michael Jurka [Wed, 2 Nov 2011 17:31:33 +0000 (17:31 +0000)]

am 93430b3c: Merge "Fix: never show recents over lock screen" into ics-mr1

* commit '93430b3c6d170bf1db538c21666e0b508e8e48ec':
Fix: never show recents over lock screen

commit | commitdiff | tree

Peter Ng [Wed, 2 Nov 2011 17:31:15 +0000 (17:31 +0000)]

am 80c3c87f: Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1

* commit '80c3c87ff08e77c3bcbd14f003e296bed9adba55':
Asset updates for tablet notifications and layout fixes to quicksettings

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 2 Nov 2011 17:31:07 +0000 (17:31 +0000)]

am 3b8d33b1: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1

* commit '3b8d33b131956f3a1b41c15dbe07b1b2d7f44086':
Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE

commit | commitdiff | tree

Robert Greenwalt [Wed, 2 Nov 2011 17:31:06 +0000 (17:31 +0000)]

am 852d72b2: am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0

* commit '852d72b28e6d7d0e6372a9b544641817338002e6':
Add cdma_rmnet4 to list of monitored interfaces

commit | commitdiff | tree

Daniel Sandler [Wed, 2 Nov 2011 17:30:42 +0000 (17:30 +0000)]

am 7775f52e: Merge "Bring timestamps back to notifications." into ics-mr1

* commit '7775f52e4aa7703a5721378f5a1103d9486af895':
Bring timestamps back to notifications.

commit | commitdiff | tree

Jim Miller [Wed, 2 Nov 2011 17:30:40 +0000 (17:30 +0000)]

am a67217c3: Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1

* commit 'a67217c35ec43e06598b71feae63ce675fa9cac7':
Fix 5404916: Make layout fit on 480x800 hdpi device

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 2 Nov 2011 17:30:39 +0000 (17:30 +0000)]

am deb15704: (-s ours) am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0

* commit 'deb15704e9abcfc71bb81a358ff3bb239896474d':
Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE

commit | commitdiff | tree

Mangesh Ghiware [Wed, 2 Nov 2011 17:30:34 +0000 (17:30 +0000)]

am 00ef15b9: Merge "Clamp initial scale between minimum and maximum values." into ics-mr1

* commit '00ef15b98ac0579ebd5f81a1753bc18384e88b8b':
Clamp initial scale between minimum and maximum values.

commit | commitdiff | tree

Adam Powell [Wed, 2 Nov 2011 17:30:29 +0000 (17:30 +0000)]

am ca4100da: Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1

* commit 'ca4100da0a0481b3b9f464bbc8842b571e8c60d5':
Fix bug 5534667 - Action bar icons need more space on tablet

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Nov 2011 17:30:26 +0000 (17:30 +0000)]

am f136aa34: Merge "Various performance and other work." into ics-mr1

* commit 'f136aa341abaaf7fd6f7632d41a30b2989d93985':
Various performance and other work.

commit | commitdiff | tree

Peter Ng [Wed, 2 Nov 2011 17:30:25 +0000 (17:30 +0000)]

am 374e23bd: Merge "spinner focused states pumped up" into ics-mr1

* commit '374e23bd11c42e7e472d2490a3dfddb7df198a66':
spinner focused states pumped up

commit | commitdiff | tree

The Android Open Source Project [Wed, 2 Nov 2011 17:30:20 +0000 (17:30 +0000)]

am a0824452: am 9eb4c891: Reconcile with ics-factoryrom-2-release

* commit 'a0824452d5c511acc7d11396ff2e6423f7b03948':
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"

commit | commitdiff | tree

Philip Milne [Wed, 2 Nov 2011 17:30:11 +0000 (17:30 +0000)]

am 3617933b: Merge " Update to fix for bug 5393156" into ics-mr1

* commit '3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf':
Update to fix for bug 5393156

commit | commitdiff | tree

Jim Miller [Wed, 2 Nov 2011 17:29:49 +0000 (17:29 +0000)]

am 22726020: am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0

* commit '2272602032e5051d5067a7a95c741304468a81af':
Fix 5497305: Make sure we show SIM unlock when "None" is selected

commit | commitdiff | tree

Chih-Chung Chang [Wed, 2 Nov 2011 17:29:46 +0000 (17:29 +0000)]

am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0

* commit '11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
Update camera continuous autofocus javadoc.

commit | commitdiff | tree

satok [Wed, 2 Nov 2011 17:29:35 +0000 (17:29 +0000)]

am ff93e417: Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1

* commit 'ff93e417a217703a635d8601b835853e07233afd':
Resolve memory leak in TextServicesManagerService

frameworks/native

RSS Atom

About OSDN

Find Software

Develop Software

Help