60757 Commits

Author SHA1 Message Date
Peter Ng
80c3c87ff0 Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1 2011-11-01 13:45:18 -07:00
Fabrice Di Meglio
3b8d33b131 Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1 2011-11-01 13:30:24 -07:00
Robert Greenwalt
852d72b28e am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
* commit 'bd9b1528051a1b257768fdbc5077a2d4473b02dd':
  Add cdma_rmnet4 to list of monitored interfaces
2011-11-01 20:29:42 +00:00
Robert Greenwalt
bd9b152805 Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0 2011-11-01 13:27:56 -07:00
Daniel Sandler
7775f52e4a Merge "Bring timestamps back to notifications." into ics-mr1 2011-11-01 13:05:41 -07:00
Fabrice Di Meglio
904221a342 Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
- better check of ICU returned values
- default to single run if ICU is returning errors

Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
2011-11-01 12:47:51 -07:00
Jim Miller
a67217c35e Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1 2011-11-01 12:45:11 -07:00
Fabrice Di Meglio
deb15704e9 am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
* commit '46e327ca32a29432941ba4487077577b10243aed':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
2011-11-01 19:42:48 +00:00
Fabrice Di Meglio
46e327ca32 Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0 2011-11-01 12:41:04 -07:00
Robert Greenwalt
57c8ac6e13 Add cdma_rmnet4 to list of monitored interfaces
Lets the data traffic arrows work on LTE device on 1x,
but also lets telephony monitor for hung radios on 1X.

bug:5531630
Change-Id: I9fa25a5223afaa2e37373668c899ac28a95783fa
2011-11-01 11:51:27 -07:00
Mangesh Ghiware
00ef15b98a Merge "Clamp initial scale between minimum and maximum values." into ics-mr1 2011-11-01 11:28:01 -07:00
Adam Powell
ca4100da0a Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1 2011-11-01 10:58:58 -07:00
Fabrice Di Meglio
26e9ee28de Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
- better check of ICU returned values
- default to single run if ICU is returning errors

Change-Id: I836818bda4fc72a27b2201f01023cd23c5d99ecb
2011-11-01 10:49:44 -07:00
Dianne Hackborn
f136aa341a Merge "Various performance and other work." into ics-mr1 2011-11-01 10:42:54 -07:00
Peter Ng
374e23bd11 Merge "spinner focused states pumped up" into ics-mr1 2011-11-01 10:29:25 -07:00
The Android Open Source Project
a0824452d5 am 9eb4c891: Reconcile with ics-factoryrom-2-release
* commit '9eb4c891a3db118f2546af7593c6251f3210f3ef':
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
2011-11-01 17:10:39 +00:00
The Android Open Source Project
9eb4c891a3 Reconcile with ics-factoryrom-2-release
Change-Id: I82d01dc0c40aeeafc6b10fd1d4bf1464a2f02254
2011-11-01 10:08:15 -07:00
Philip Milne
3617933bee Merge " Update to fix for bug 5393156" into ics-mr1 2011-11-01 09:30:21 -07:00
Daniel Sandler
e37233038e Bring timestamps back to notifications.
Bug: 5371747
Change-Id: I3ef52140b37b9926fc9b745e60210a6dd7a036b8
2011-11-01 11:34:34 -04:00
Jim Miller
2272602032 am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
* commit '1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea':
  Fix 5497305: Make sure we show SIM unlock when "None" is selected
2011-11-01 07:49:46 +00:00
Jim Miller
1dce37bd6b Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 2011-11-01 00:47:44 -07:00
Adam Powell
24340afbab Fix bug 5534667 - Action bar icons need more space on tablet
Set a wider minimum width for the action button style on -sw600dp.

Fix an annoying bug where recycled ActionMenuItemViews would retain a
lingering pressed state, causing an unrelated button to glow briefly.

The home/up affordance should not be focusable when it is disabled.

Change-Id: Ia68f3d09f5d977f50e4e33c354d8133367187973
2011-10-31 22:11:24 -07:00
Chih-Chung Chang
11ba6da460 am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '4b6353ea0265bfed52d0637abd1b17596ce25ff0':
  Update camera continuous autofocus javadoc.
2011-11-01 04:05:45 +00:00
Chih-Chung Chang
4b6353ea02 Merge "Update camera continuous autofocus javadoc." into ics-mr0 2011-10-31 21:04:01 -07:00
Jim Miller
9fa1ada318 Fix 5497305: Make sure we show SIM unlock when "None" is selected
Previously the code ignored SIM state when lockscreen was set to "None."
It now properly accounts for the SIM state when deciding to show.

Change-Id: I272348c1a21b57ac146910850ea3db3adef0227c
2011-10-31 18:21:49 -07:00
satok
ff93e417a2 Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1 2011-10-31 18:20:48 -07:00
Adam Powell
b1db20bde5 Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1 2011-10-31 18:18:33 -07:00
Stephen Hines
af3a854b54 am af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0
* commit 'af675222f6340a8a9edbe9e8635014a18521e5e0':
  Fix potential segfault in RS watchdog.
2011-11-01 00:16:56 +00:00
Stephen Hines
af675222f6 Merge "Fix potential segfault in RS watchdog." into ics-mr0 2011-10-31 17:14:58 -07:00
Dianne Hackborn
2c84cfc001 Various performance and other work.
- IME service now switches between visible and perceptible depending on
  whether it is being showm, allowing us to more aggressively free its
  memory when not shown.

- The activity display time is no longer delayed by the activity
  transition animation.

- New -R (repeat) option for launching activities with the am command.

- Improved some documentation on Loader to be clear about some methods
  that apps should not normally call.

- FrameworkPerf test now allows you to select individual tests to run.

Change-Id: Id1f73de66dc93d63212183958a72119ad174318b
2011-10-31 16:52:34 -07:00
The Android Automerger
3b25c4d845 Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
2011-10-31 16:47:11 -07:00
Adam Powell
dcce1216b0 Fix bug 5514022 - ListView should not auto-scroll selected item to top
when gaining focus

Change-Id: I9b82cba3d48a211b1d2017d66791bea466938cab
2011-10-31 16:41:21 -07:00
Philip Milne
6b248641fc Update to fix for bug 5393156
Tweak to the logic to take account of margins when gravity = FILL is used and
    there is a measurement dependency between the axes (as in mulit-line text).

Cherry pick ecab1178648670f2c72b47faf250040fcded3d13 to MR1

Change-Id: Ic0c95a4618bdb32acca75219796c66c1fc467610
2011-10-31 16:26:55 -07:00
Eric Laurent
cd84197ac1 am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
* commit '6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
  Fix volume indication in vibrate mode.
2011-10-31 23:23:15 +00:00
Eric Laurent
6e91e5b689 Merge "Fix volume indication in vibrate mode." into ics-mr0 2011-10-31 16:21:16 -07:00
Martijn Coenen
b288f99334 am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
* commit '1eca250b9dad45893fead128539f112cbc513496':
  Fix disableForegroundNdefPush crash.
2011-10-31 22:54:43 +00:00
Martijn Coenen
1eca250b9d Merge "Fix disableForegroundNdefPush crash." into ics-mr0 2011-10-31 15:53:08 -07:00
Jim Miller
5750b1ffb7 Fix 5404916: Make layout fit on 480x800 hdpi device
This fixes the layout to work on a 480x800 device.  Change required
not making the font scalable anymore as well as reducing the padding above
and below the clock to reduce the layout by 7 pixels.

Change-Id: I9a18c60bf89873b849069f1f52de1db727de668a
2011-10-31 15:50:13 -07:00
Stephen Hines
a049184274 Fix potential segfault in RS watchdog.
BUG=5544671

This initializes the watchdog structure properly. Without this fix, it is
possible to call LOGE with a garbage string value.

Change-Id: Ie05eb65f83eca938f18ac962794407d58c3f277f
2011-10-31 15:42:40 -07:00
Martijn Coenen
deb0f20c3d Fix disableForegroundNdefPush crash.
It crashed due to the fact that we're committing a fragment change
after onSaveInstanceState() is called. Instead, commit without
storing the state - as the NfcFragment is something that needs
to be setup explicitly anyway, it is not something the user
expects to be restored.

Bug: 5540962
Change-Id: I5a8cd0e47306f2bbc14b592a0182083bb79cb21a
2011-10-31 15:42:13 -07:00
Peter Ng
9359979c75 spinner focused states pumped up
-old spinner states were not visible enough, pumped up the background to solve the issue

Change-Id: I4317d2aeef04409df5be1cca47ced91a5a564f76
2011-10-31 15:20:47 -07:00
Pannag Sanketi
dd79b4c85a Merge "Expose video stabilization API" into ics-mr1 2011-10-31 15:05:19 -07:00
Mangesh Ghiware
ca4d54c486 Clamp initial scale between minimum and maximum values.
Fixes bug 5515454: web page is not optimized (gmarket)

Initial scale is used to detect mobile sites
In ICS, mobile site detection based on whether the URL included m.,
mobile., wap., etc. has been removed in exclusive favor of the meta
viewport tag.

Within meta viewport tag, mobile site detection uses width (set to
device-width), initial-scale (set to 1.0 or default scale), etc. Make
this logic more robust by clamping initial scale between minimum and
maximum values, if specified.

Change-Id: I663c50ce20b35279d37a8c812e91d6bc4c16c1d3
2011-10-31 14:41:38 -07:00
Pannag Sanketi
d47823e359 Expose video stabilization API
Related to bug:5469735

Change-Id: I0a8245b37eed7f2cb58d35c7a9a7b3b293b64694
2011-10-31 14:17:46 -07:00
Svetoslav Ganov
62015f5d0d am aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
* commit 'aeb11b598877523fd3c530c7a086c38b4a13c7a1':
  Folding Accessibility Service sample into ApiDemos.
2011-10-31 20:30:30 +00:00
Svetoslav Ganov
aeb11b5988 Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0 2011-10-31 13:28:57 -07:00
The Android Open Source Project
d59daca890 Reconcile with ics-mr0-release
Change-Id: Ice28e0b55ab17842c9bd01b519b7f4d562822445
2011-10-31 13:06:22 -07:00
Tom Taylor
adfe6383ee Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1 2011-10-31 12:51:19 -07:00
The Android Open Source Project
d7f36121f6 am 50d0511d: Reconcile with ics-factoryrom-2-release
* commit '50d0511ddbf226255347e95a6382af8b0e7d366b':
  Revert "Improve the slow query instrumentation."
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
2011-10-31 19:45:33 +00:00
The Android Open Source Project
50d0511ddb Reconcile with ics-factoryrom-2-release
Change-Id: Ic64060bceb7aef3ab5958a8b404e64526f794662
2011-10-31 12:43:39 -07:00