63601 Commits

Author SHA1 Message Date
Adam Powell
3bda1dc4f2 am b1dbf8e6: Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
* commit 'b1dbf8e605c29ac00dde187579bd8ff8f18d7ba3':
  Change the "start deferred" fragment API to "user visible hint"
2011-11-07 22:58:51 +00:00
Adam Powell
b1dbf8e605 Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1 2011-11-07 14:56:36 -08:00
Peter Ng
7de32faea7 am e1aacdfe: Merge "Added focused state to quickcontacts shortcut" into ics-mr1
* commit 'e1aacdfe26eabf1ff31a6ddd8590fdea360614db':
  Added focused state to quickcontacts shortcut
2011-11-07 22:39:47 +00:00
Peter Ng
e1aacdfe26 Merge "Added focused state to quickcontacts shortcut" into ics-mr1 2011-11-07 14:37:31 -08:00
Jim Miller
fdfc404875 am 4d8ecc65: Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1
* commit '4d8ecc65c5a747f350492b21397d7466ff628900':
  Fix 5231823: PIN/Password polish on lock screen
2011-11-07 22:26:56 +00:00
Jim Miller
4d8ecc65c5 Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1 2011-11-07 14:24:43 -08:00
Peter Ng
d52ec9f3c2 Added focused state to quickcontacts shortcut
Bug: 5566627
Change-Id: I559660d71fa571d9201f99dbf76befa8b3276d9e
2011-11-07 13:55:29 -08:00
Adam Powell
78fed9b78f Change the "start deferred" fragment API to "user visible hint"
Allow a fragment to set a hint of whether or not it is currently user
visible. This will be used implicitly to defer the start of fragments
that are not user visible until the loaders for visible fragments have
run. This hint defaults to true.

Change-Id: Id1349d319886a277ef07301f64f7b9e12c8729bf
2011-11-07 13:47:13 -08:00
Peter Ng
b5d1d7f3da am a50c859d: Merge "Color balancing framework assets" into ics-mr1
* commit 'a50c859d3f071b9d405bf461e34f11d40f20561e':
  Color balancing framework assets
2011-11-07 21:42:31 +00:00
Peter Ng
a50c859d3f Merge "Color balancing framework assets" into ics-mr1 2011-11-07 13:40:45 -08:00
Peter Ng
4f4882ad12 Color balancing framework assets
-btns are more opaque
-toggle buttons are now blue
-spinners have better antialiasing
-quick contacts have a thicker divider
-switches are flipped

Bug:5560030
Change-Id: I28f64aa2be6c7f0d8c82e9b7c318aaf2bfd98ea7
2011-11-07 13:16:36 -08:00
Eric Fischer
cb99ac697b am 08be43a6: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '08be43a6d912fe1f34596d5e90df6b497424af02':
  Import revised translations.  DO NOT MERGE
2011-11-07 20:38:50 +00:00
Eric Fischer
08be43a6d9 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-07 12:36:02 -08:00
Eric Fischer
2f6172e35a Import revised translations. DO NOT MERGE
Change-Id: Ib095d85d01ffce5201d1e91d7c90c516f8c4c89c
2011-11-07 12:34:57 -08:00
Amith Yamasani
93004b10b7 am 7919bfb1: Merge "Don\'t show the submit button when it isn\'t enabled." into ics-mr1
* commit '7919bfb12365b3f84e232235c35df957039995b7':
  Don't show the submit button when it isn't enabled.
2011-11-07 18:59:04 +00:00
Amith Yamasani
7919bfb123 Merge "Don't show the submit button when it isn't enabled." into ics-mr1 2011-11-07 10:57:17 -08:00
Winson Chung
6c62552308 am 19c86cac: Merge "Fixing screenshot border asset." into ics-mr1
* commit '19c86cacb2f0ba04cc93084ba474662afb17d88f':
  Fixing screenshot border asset.
2011-11-07 18:22:05 +00:00
Winson Chung
19c86cacb2 Merge "Fixing screenshot border asset." into ics-mr1 2011-11-07 10:20:37 -08:00
Daniel Sandler
795f1bf4c4 am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1
* commit '010bb273a58444f907bb82f62f8d7274f9637b49':
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 18:13:20 +00:00
Daniel Sandler
010bb273a5 Merge changes I0da0f04f,I93197665 into ics-mr1
* changes:
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 10:11:52 -08:00
The Android Open Source Project
d458881819 am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '064975c27cbca412e682fa152ce00af14027ab4f':
  Fix a leak in Parcel::writeBlob.
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
2011-11-07 17:37:20 +00:00
The Android Open Source Project
064975c27c Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
2011-11-07 08:22:56 -08:00
Joe Onorato
ab26b50134 Was generating code that uses the wrong RpcData.
Change-Id: I7984ac8306d7e293c6e4ccb75c5f03c508e465af
2011-11-06 18:14:40 -08:00
The Android Automerger
ceb6cdf063 merge in ics-mr0-release history after reset to ics-mr0 2011-11-06 06:28:19 -08:00
Dianne Hackborn
23d1092a75 am 6581043a: am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
* commit '6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0':
  Print out memory info when we get into a low memory situation.
2011-11-05 07:36:22 +00:00
Dianne Hackborn
6581043a44 am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
* commit '7311bd4b709750384b058d8e988e2e983c97b3f2':
  Print out memory info when we get into a low memory situation.
2011-11-05 07:34:03 +00:00
The Android Automerger
b655ee47c5 merge in ics-mr0-release history after reset to ics-mr0 2011-11-05 00:33:21 -07:00
Dianne Hackborn
7311bd4b70 Merge "Print out memory info when we get into a low memory situation." into ics-mr0 2011-11-05 00:31:17 -07:00
Jeff Brown
829a6f208c Fix a leak in Parcel::writeBlob.
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in.  It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.

Bug: 5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
2011-11-04 22:16:39 -07:00
Dianne Hackborn
04d6db380f Print out memory info when we get into a low memory situation.
Change-Id: I2c8b8847a0f38135d8bf9ff9b7198517c3b0262e
2011-11-04 20:07:24 -07:00
Mathias Agopian
308b327fb6 am 3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1
* commit '3f24589edd860618ccf65d6653b002d13810e78b':
  workaround to set the WM refresh rate to 48 Hz for tuna devices only
2011-11-05 03:00:13 +00:00
Mathias Agopian
3f24589edd Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1 2011-11-04 19:57:59 -07:00
Jeff Brown
7bc2ff261d am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob.
* commit '88061d6b38cfb4bf374039846b753a3b21ac61e1':
  Fix a leak in Parcel::writeBlob.
2011-11-05 02:38:33 +00:00
Jeff Brown
88061d6b38 am 5462bc63: Fix a leak in Parcel::writeBlob.
* commit '5462bc6318b4b70e7a58c66994e2bd79f59d9739':
  Fix a leak in Parcel::writeBlob.
2011-11-05 02:35:57 +00:00
Jeff Brown
5462bc6318 Fix a leak in Parcel::writeBlob.
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in.  It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.

Bug: 5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
2011-11-04 19:26:03 -07:00
Mathias Agopian
222357f33a workaround to set the WM refresh rate to 48 Hz for tuna devices only
this is TEMPORARY until we can do this properly.

Bug: 5572464
Change-Id: I6537706d636a83a4a50e2900d6b829dd89b6f245
2011-11-04 18:46:11 -07:00
Jim Miller
d9d09451cc Fix 5231823: PIN/Password polish on lock screen
Fixes these issues:
- add IME button to switch IMEs on password screen on tablet
- centers '0' on PIN screen for phones and tablets
- tablets now use the same ICS background key asset as phones
- make PIN layout consistent between phones and tablet
- center the I-beam when any button is showing in the password entry field

Change-Id: I4da0173f9b2efeab46617c5a41a8132895b63a97
2011-11-04 17:26:26 -07:00
Romain Guy
b4decdf456 am 2ccc47b8: Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1
* commit '2ccc47b89868d4f39683e0e2bd057ce95d7d1217':
  Memory optimizations for libhwui Bug #5566149
2011-11-04 23:37:07 +00:00
Romain Guy
2ccc47b898 Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1 2011-11-04 16:35:35 -07:00
Romain Guy
eca0ca2424 Memory optimizations for libhwui
Bug #5566149

Lazily initialize font renderers
Keep 60% of the texture cache when an app goes to the background
Delete least used font renderer when going to the background
Delete all font renderers on full memory trim

Change-Id: I3c2454d46dc1107ec0f0f72a9ce69cbbcc8825e7
2011-11-04 16:23:47 -07:00
Robert Greenwalt
796ef0d0e1 am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit 'fd900f05fb67046b97701f20626f7fd408fd8990':
  Start using IP tool for advanced routing.
2011-11-04 22:57:48 +00:00
Robert Greenwalt
fd900f05fb am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
  Start using IP tool for advanced routing.
2011-11-04 22:55:30 +00:00
Robert Greenwalt
348297abc0 Merge "Start using IP tool for advanced routing." into ics-mr0 2011-11-04 15:53:37 -07:00
The Android Automerger
35eee402c7 merge in ics-mr0-release history after reset to ics-mr0 2011-11-04 15:40:13 -07:00
Andreas Huber
6d25e3400c DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
2011-11-04 15:17:55 -07:00
Jamie Gennis
73d4724014 am 2ab7ec90: Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1
* commit '2ab7ec90e4a6f21bee7cbfebbd751d32d4cf9e03':
  EGL: Add stubs for EGL_ANDROID_blob_cache
2011-11-04 22:11:19 +00:00
Jamie Gennis
2ab7ec90e4 Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1 2011-11-04 15:10:11 -07:00
Jamie Gennis
0dc908ce71 EGL: Add stubs for EGL_ANDROID_blob_cache
This change adds a stub cache implementation that gets passed to the
underlying EGL implementation at initialization time.

Change-Id: I14437c5b6f91b7a34a19bb02ad802e6e54f88d2a
2011-11-04 15:01:51 -07:00
Dianne Hackborn
d0660c55c3 am 960177ae: am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
* commit '960177ae394a466d765a2dc171e136f9fdea06b6':
  DO NOT MERGE.  Integrate: Include showmap output in bug report.
2011-11-04 21:03:54 +00:00
Dianne Hackborn
960177ae39 am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
* commit 'ca25016775391bf71f7503aeb61798df46fa54cf':
  DO NOT MERGE.  Integrate: Include showmap output in bug report.
2011-11-04 21:01:40 +00:00