Mangesh Ghiware
d99e7accde
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-02 17:30:34 +00:00
Adam Powell
e5b7967989
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-02 17:30:29 +00:00
Dianne Hackborn
9e9a64e875
am f136aa34: Merge "Various performance and other work." into ics-mr1
...
* commit 'f136aa341abaaf7fd6f7632d41a30b2989d93985':
Various performance and other work.
2011-11-02 17:30:26 +00:00
Chih-Chung Chang
25ba325ad3
am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
...
* commit '11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
Update camera continuous autofocus javadoc.
2011-11-02 17:29:46 +00:00
Adam Powell
a0684aafc8
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-02 17:29:33 +00:00
Martijn Coenen
579117036b
am b288f993: am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
...
* commit 'b288f99334348a21ffb465b37a4522998b452410':
Fix disableForegroundNdefPush crash.
2011-11-01 21:59:16 +00:00
Pannag Sanketi
0d04c02a48
am dd79b4c8: Merge "Expose video stabilization API" into ics-mr1
...
* commit 'dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1':
Expose video stabilization API
2011-11-01 21:59:09 +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
ca4100da0a
Merge "Fix bug 5534667 - Action bar icons need more space on tablet" into ics-mr1
2011-11-01 10:58:58 -07:00
Dianne Hackborn
f136aa341a
Merge "Various performance and other work." into ics-mr1
2011-11-01 10:42:54 -07:00
Philip Milne
3617933bee
Merge " Update to fix for bug 5393156" into ics-mr1
2011-11-01 09:30:21 -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
Nick Pelly
9fcc5ce71e
Merge "API Change: add isNdefPushEnabled() & ACTION_NFC_SETTINGS."
2011-10-31 22:09:10 -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
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
Gilles Debunne
93fdebb5ff
Merge "No threading issues in SpellChecker."
2011-10-31 17:25:08 -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 ecab117864 to MR1
Change-Id: Ic0c95a4618bdb32acca75219796c66c1fc467610
2011-10-31 16:26:55 -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
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
Tom Taylor
70816999f9
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 22:13:39 +00:00
Adam Powell
1648a39932
am 1759af3b: Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1
...
* commit '1759af3bc8a8f1346e3fb95351ed8037f38526d8':
Bug 5535639 - Monkeys mad at FragmentManager
2011-10-31 22:13:33 +00:00
Marco Nelissen
ab9b7091fc
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 22:13:21 +00:00
Michael Jurka
69cde42890
am b4529b0a: Merge "HorizontalScrollView should delay child presses" into ics-mr1
...
* commit 'b4529b0adca243644f601c9fe5d419c283bf57c1':
HorizontalScrollView should delay child presses
2011-10-31 22:13:16 +00:00
Amith Yamasani
468825f60a
am 18936d7d: am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
...
* commit '18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb':
Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
2011-10-31 22:13:08 +00:00
Jeff Brown
fa59cfbc85
resolved conflicts for merge of bce45617 to master
...
Change-Id: Ieb966e674dca3ec46cd3cd25e4de281f1be747c2
2011-10-31 15:10:10 -07:00
Pannag Sanketi
dd79b4c85a
Merge "Expose video stabilization API" into ics-mr1
2011-10-31 15:05:19 -07:00
Nick Pelly
cccf01d3e2
API Change: add isNdefPushEnabled() & ACTION_NFC_SETTINGS.
...
Modify isNdefPushEnabled() semantics slightly - true only if isNfcEnabled && NDEF push enabled.
Fix up docs.
Change-Id: Icd2df9c636ecf2d8274851bbda423f2eae7bac5f
2011-10-31 14:49:40 -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
adfe6383ee
Merge "NPE in Threads.getOrCreateThreadId(Telephony.java:1275)" into ics-mr1
2011-10-31 12:51:19 -07: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
Gilles Debunne
e9b82808d4
No threading issues in SpellChecker.
...
SpellChecker is exclusively called from the main UI thread and
there are no concurrency issues. As a result, the TextView's
wordIterator can safely be re-used in the parse() method.
Also reset the pool of SpellParsers on language change.
Change-Id: I1cc8a2750f21233754f006e40a81622730030ec8
2011-10-31 11:38:40 -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
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
Joe Fernandez
eba186448f
am 74b2b954: am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
...
* commit '74b2b9547329a0b05e0bd5701057696007b854bb':
docs: add developer guide cross references, Project ACRE, round 3
2011-10-31 12:26:31 +00:00
satok
d412f9f15b
am 4a6d0879: Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1
...
* commit '4a6d0879465ea6eb52b2b75e9fa2a4a84e1b0d86':
Add a flag for recommended suggestions of the spell checker
2011-10-31 12:26:23 +00:00
Dianne Hackborn
f82621dc3c
am e02c88af: Work on process management.
...
* commit 'e02c88af7935c72fb90a478375e61e4a94465587':
Work on process management.
2011-10-31 12:26:15 +00:00
Adam Powell
aa7cbf90ca
am 678ed0c5: Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances.
...
* commit '678ed0c5a32bac1ea18a5ac99b0b814421ea79b4':
Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
2011-10-31 12:26:08 +00:00
Michael Jurka
b4529b0adc
Merge "HorizontalScrollView should delay child presses" into ics-mr1
2011-10-30 19:41:24 -07:00
Amith Yamasani
18936d7d1d
am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
...
* commit '69e640ee84fc218d6318acaf73a1c1841d7fba6b':
Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
2011-10-30 21:37:09 +00:00
Jeff Brown
bce4561708
resolved conflicts for merge of 2d280f75 to ics-mr1
...
Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
2011-10-30 14:24:02 -07:00
Jesse Wilson
ddcc3a53d1
Merge "Interpret '+' as a space char in the URL query params."
2011-10-29 10:14:34 -07:00
Joe Fernandez
74b2b95473
am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
...
* commit '09848bc89de999416e2de82a7693b2deec6bf802':
docs: add developer guide cross references, Project ACRE, round 3
2011-10-29 02:16:10 +00:00
Amith Yamasani
69e640ee84
Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
2011-10-28 18:59:11 -07:00
Amith Yamasani
c696a53d1f
Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
...
In order to completely mute the ringer (no vibrate), introduce an extra
state beyond mute, which mutes the vibrator as well, if it was enabled.
Bug: 5530217
Change-Id: Ib1f299ee6bbca56c1aa7e1100662591362d08307
2011-10-28 18:40:43 -07:00
satok
4a6d087946
Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1
2011-10-28 18:26:40 -07:00
Jeff Brown
2d280f754e
Merge "Improve the slow query instrumentation." into ics-mr0
2011-10-28 18:21:05 -07:00