Fabrice Di Meglio
65a466ae46
am 3b8d33b1: 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
2011-11-01 20:32:40 +00:00
Robert Greenwalt
5b189a071a
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
2011-11-01 20:32:38 +00: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
8c8b1c677d
am 7775f52e: Merge "Bring timestamps back to notifications." into ics-mr1
...
* commit '7775f52e4aa7703a5721378f5a1103d9486af895':
Bring timestamps back to notifications.
2011-11-01 20:07:23 +00: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
038590191d
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
2011-11-01 19:46:52 +00: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
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
e47f48a142
am 00ef15b9: Merge "Clamp initial scale between minimum and maximum values." into ics-mr1
...
* commit '00ef15b98ac0579ebd5f81a1753bc18384e88b8b':
Clamp initial scale between minimum and maximum values.
2011-11-01 18:30:26 +00: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
9a60c0d466
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
2011-11-01 18:00:58 +00: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
88175571f2
am f136aa34: Merge "Various performance and other work." into ics-mr1
...
* commit 'f136aa341abaaf7fd6f7632d41a30b2989d93985':
Various performance and other work.
2011-11-01 17:44:04 +00:00
Dianne Hackborn
f136aa341a
Merge "Various performance and other work." into ics-mr1
2011-11-01 10:42:54 -07:00
Peter Ng
d2ff672844
am 374e23bd: Merge "spinner focused states pumped up" into ics-mr1
...
* commit '374e23bd11c42e7e472d2490a3dfddb7df198a66':
spinner focused states pumped up
2011-11-01 17:31:43 +00:00
Peter Ng
374e23bd11
Merge "spinner focused states pumped up" into ics-mr1
2011-11-01 10:29:25 -07:00
Philip Milne
c96a88f4fb
am 3617933b: Merge " Update to fix for bug 5393156" into ics-mr1
...
* commit '3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf':
Update to fix for bug 5393156
2011-11-01 16:32:00 +00: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
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
fdfbe58298
am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
...
* commit '11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
Update camera continuous autofocus javadoc.
2011-11-01 04:09:00 +00: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
Adam Powell
9e47185b1c
am b1db20bd: Merge "Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1
...
* commit 'b1db20bde5e00c8cdd1a97b07ddcc41f321d3db8':
Fix bug 5514022 - ListView should not auto-scroll selected item to top when gaining focus
2011-11-01 01:20:31 +00: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
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
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
Martijn Coenen
afacee4917
am b288f993: am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
...
* commit 'b288f99334348a21ffb465b37a4522998b452410':
Fix disableForegroundNdefPush crash.
2011-10-31 22:56:08 +00: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
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
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
78e62359e3
am dd79b4c8: Merge "Expose video stabilization API" into ics-mr1
...
* commit 'dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1':
Expose video stabilization API
2011-10-31 22:07:19 +00: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
Tom Taylor
4d338ba098
am adfe6383: Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1
...
* commit 'adfe6383ee963b890bfbf319d219a23164804925':
NPE in Threads.getOrCreateThreadId(Telephony.java:1275)
2011-10-31 19:53:06 +00:00
Tom Taylor
adfe6383ee
Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1
2011-10-31 12:51:19 -07:00
Adam Powell
0a9dd820eb
am 1759af3b: Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1
...
* commit '1759af3bc8a8f1346e3fb95351ed8037f38526d8':
Bug 5535639 - Monkeys mad at FragmentManager
2011-10-31 19:39:10 +00:00
Adam Powell
37510908a7
Bug 5535639 - Monkeys mad at FragmentManager
...
Also check for starting deferred start fragments when a loader is
destroyed.
Change-Id: Ia17a902c579c09d7ac01079c7c1da137635aa08b
2011-10-31 11:48:24 -07:00
Tom Taylor
fbf1d27d24
NPE in Threads.getOrCreateThreadId(Telephony.java:1275)
...
Bug 5541883
Remove obsolete debug statement.
Change-Id: I8d2f6e33f36c920838460bca7a1db117dd0edf7b
2011-10-31 11:15:06 -07:00
Marco Nelissen
7346084872
am 6d4b9f0b: Merge "Make MediaController use low profile system UI" into ics-mr1
...
* commit '6d4b9f0b409dd15d8ada0a990f9c5785bdbd2e9f':
Make MediaController use low profile system UI
2011-10-31 17:48:07 +00:00
Marco Nelissen
d763c2cbe8
Make MediaController use low profile system UI
...
This makes the MediaController iused by the full screen html5 video
view copy the system ui visibility of its owner. Some issues remain.
b/5494143
Change-Id: I6b157226974befbee5ba685d42d1ef72c113664d
2011-10-31 08:34:24 -07:00
Ed Heyl
92537e6ff2
merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)
...
Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928
2011-10-31 06:06:27 -07:00