OSDN Git Service
Billy Hewlett [Thu, 21 Jun 2012 16:58:42 +0000 (09:58 -0700)]
Revert "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview""
This reverts commit
6fadccd2484233ed570218b3f97c085ef1a1ec28
Billy Hewlett [Thu, 21 Jun 2012 16:45:30 +0000 (09:45 -0700)]
Revert "Use Elegant fonts for Webkit, Compact fonts for Textview"
This reverts commit
ecf80965d05e44b3701b3392aeb02028daacf1b0
Billy Hewlett [Thu, 7 Jun 2012 15:50:14 +0000 (08:50 -0700)]
Use Elegant fonts for Webkit, Compact fonts for Textview
Fonts can be marked with elegant or compact in fallback_fonts.xml.
Webkit uses elegant fonts, Textview uses compact fonts (the default),
unmarked fonts are used by both.
Bug:
6649136
Change-Id: Ie0debcddc13350bf60fe3139cd7ae533e466f02b
Raph Levien [Tue, 19 Jun 2012 15:43:56 +0000 (08:43 -0700)]
Merge "Fix bug
6688060: breakage in AndroidCharacter.mirror"
The Android Open Source Project [Tue, 19 Jun 2012 14:20:52 +0000 (07:20 -0700)]
The Android Open Source Project [Tue, 19 Jun 2012 14:15:35 +0000 (07:15 -0700)]
Reconcile with jb-release
Change-Id: I4200341adee9a73e326fb9f0c6eefa3d8e01a2b9
The Android Automerger [Tue, 19 Jun 2012 14:03:42 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Steve Block [Tue, 19 Jun 2012 13:42:36 +0000 (06:42 -0700)]
Merge "Clarify JavaDoc for setting database paths in WebSettings"
The Android Open Source Project [Tue, 19 Jun 2012 13:19:56 +0000 (06:19 -0700)]
am
5158db8b: Reconcile with jb-release
* commit '
5158db8b07e9512788ecf1f887643e8bc25ce48f':
Fix an NPE and possible unsynchronized call of Locked method.
Fix
6665117: ACTION_ASSIST visual improvements
Capture window manager's last ANR state in bug report.
Capture input dispatcher's last ANR state in bug report.
Fix issue #
6636731: Mariner animation ring gets stuck
Jelly Bean ringtone Bug:
6619980
Remove Disco video from builds.
Change snap behavior for lock screen
Improve ANR diagnostics.
Detect bad behavior earlier in Choreographer.
Revert "Fix fake bold for fallback fonts in frameworks."
Include important native processes in watchdog stacks.
Fix issue #
6641368: can't launch gallery
The Android Open Source Project [Tue, 19 Jun 2012 13:13:23 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: I451b63991c4550290f6e32f2f555f0412bf0b28c
Adam Powell [Tue, 19 Jun 2012 04:43:46 +0000 (21:43 -0700)]
am
29a2f84f: am
5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-dev
* commit '
29a2f84fbee96c1bbbcb50eceb17d9b726854146':
MediaRouter bluetooth a2dp selection
Adam Powell [Tue, 19 Jun 2012 04:40:19 +0000 (21:40 -0700)]
am
5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-dev
* commit '
5bb835a95942b0b313b2fa4e3f05941e630f9be7':
MediaRouter bluetooth a2dp selection
Adam Powell [Tue, 19 Jun 2012 04:36:23 +0000 (21:36 -0700)]
Merge "MediaRouter bluetooth a2dp selection" into jb-dev
Adam Powell [Mon, 18 Jun 2012 23:14:46 +0000 (16:14 -0700)]
MediaRouter bluetooth a2dp selection
Remove bluetooth permission check from internal AudioService method
setBluetoothA2dpOn
Manage BT A2DP state in MediaRouter. A2DP is only enabled or disabled
when either the system built-in audio route or the A2DP audio route is
selected; when selecting any other route the current state is left
alone.
Change-Id: Ib14274e206e79bd8762edca1205ecfa87b7a94cf
Jeff Brown [Tue, 19 Jun 2012 01:29:13 +0000 (18:29 -0700)]
Move power manager to a new package.
Change-Id: I5f5a6435e64354b7d6535e8e9a63934ba7a3f448
Gilles Debunne [Tue, 19 Jun 2012 01:59:25 +0000 (18:59 -0700)]
am
4c268a32: am
badf5a94: Merge "Fixed text rendering issue with spans." into jb-dev
* commit '
4c268a32714fefe141d093abb59806a2d6f2991c':
Fixed text rendering issue with spans.
Gilles Debunne [Tue, 19 Jun 2012 01:56:12 +0000 (18:56 -0700)]
am
badf5a94: Merge "Fixed text rendering issue with spans." into jb-dev
* commit '
badf5a9442e639dc6ae2c4794c202143f6d2f16d':
Fixed text rendering issue with spans.
Gilles Debunne [Tue, 19 Jun 2012 01:53:30 +0000 (18:53 -0700)]
Merge "Fixed text rendering issue with spans." into jb-dev
Craig Mautner [Tue, 19 Jun 2012 01:07:46 +0000 (18:07 -0700)]
am
ae3e5bc9: am
89f5a462: Merge "More paths for turning on screen immediately." into jb-dev
* commit '
ae3e5bc93f1077615b4ec8f6fbd06509241d25de':
More paths for turning on screen immediately.
Craig Mautner [Tue, 19 Jun 2012 01:04:42 +0000 (18:04 -0700)]
am
89f5a462: Merge "More paths for turning on screen immediately." into jb-dev
* commit '
89f5a4624bfa487cb5fb192d9c3c9b30937b3f26':
More paths for turning on screen immediately.
Craig Mautner [Tue, 19 Jun 2012 01:01:53 +0000 (18:01 -0700)]
Merge "More paths for turning on screen immediately." into jb-dev
Nicolas Falliere [Tue, 19 Jun 2012 00:45:40 +0000 (17:45 -0700)]
am
277c09f6: am
56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev
* commit '
277c09f6c16c4adfd50407e2fa4dbf61a0e06e55':
Added or fixed doctrings for required permissions.
Nicolas Falliere [Tue, 19 Jun 2012 00:42:57 +0000 (17:42 -0700)]
am
56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev
* commit '
56bb344ccfd3d261cea9987c98a17d0820279b17':
Added or fixed doctrings for required permissions.
Nicolas Falliere [Tue, 19 Jun 2012 00:39:48 +0000 (17:39 -0700)]
Merge "Added or fixed doctrings for required permissions." into jb-dev
Jim Miller [Tue, 19 Jun 2012 00:25:37 +0000 (17:25 -0700)]
am
60fd2b2d: am
ddbc85cb: Merge "Fix
6683092: tune GlowPadView wave animation" into jb-dev
* commit '
60fd2b2de286f3543cf9db9550db9083211ca5ea':
Fix
6683092: tune GlowPadView wave animation
Jim Miller [Tue, 19 Jun 2012 00:23:28 +0000 (17:23 -0700)]
am
ddbc85cb: Merge "Fix
6683092: tune GlowPadView wave animation" into jb-dev
* commit '
ddbc85cbfdc8ac6ed02b104f0e9c46018a0e1c53':
Fix
6683092: tune GlowPadView wave animation
Nicolas Falliere [Tue, 19 Jun 2012 00:21:06 +0000 (17:21 -0700)]
Added or fixed doctrings for required permissions.
Bug:
6591338
Change-Id: Ia2092f9994854701b5fa1425c371817367ae07ec
Jim Miller [Tue, 19 Jun 2012 00:22:10 +0000 (17:22 -0700)]
Merge "Fix
6683092: tune GlowPadView wave animation" into jb-dev
Jim Miller [Tue, 19 Jun 2012 00:04:58 +0000 (17:04 -0700)]
Fix
6683092: tune GlowPadView wave animation
This adds some aesthetic changes to the wave animation for GlowPadView:
- wave shape is no longer symmetric
- disable expand in keyguard
- enable expand in SearchPanelView (when mAlwaysTrackFinger == true)
- if a current wave animation isn't finished yet, don't start a new one
- various timing changes
Change-Id: Ibce96f45eb6a94582c694108b99e243fd57b1955
Amith Yamasani [Mon, 18 Jun 2012 23:53:39 +0000 (16:53 -0700)]
am
39758edb: am
386ce58a: Merge "Don\'t backup or delete the backup file, if it\'s in the backup path." into jb-dev
* commit '
39758edbed0be8f3d75427f750db6e9d005cd16a':
Don't backup or delete the backup file, if it's in the backup path.
Craig Mautner [Mon, 18 Jun 2012 23:53:27 +0000 (16:53 -0700)]
More paths for turning on screen immediately.
This fix forces the path through the updateLightsLocked method to turn
the screen on immediately if mWaitingForFirstLightSensor is true. Also
do not clear mWaitingForFirstLightSensor if mPreparingForScreenOn
is true. Wait until it turns false.
Fixes bug
6612418.
Change-Id: I03407e748cce4906a73de1f15df1654649b133c4
Amith Yamasani [Mon, 18 Jun 2012 23:51:41 +0000 (16:51 -0700)]
am
386ce58a: Merge "Don\'t backup or delete the backup file, if it\'s in the backup path." into jb-dev
* commit '
386ce58a21b81390d2831b0f1107d03773af687a':
Don't backup or delete the backup file, if it's in the backup path.
Amith Yamasani [Mon, 18 Jun 2012 23:49:28 +0000 (16:49 -0700)]
Merge "Don't backup or delete the backup file, if it's in the backup path." into jb-dev
Dianne Hackborn [Mon, 18 Jun 2012 23:24:03 +0000 (16:24 -0700)]
am
56b3a321: am
1991850d: Merge "Implement issue #
6680894: Provide a way to configure app defaults..." into jb-dev
* commit '
56b3a321e7c6f03d1bc0c5c0915d56bc46b7a33e':
Implement issue #
6680894: Provide a way to configure app defaults...
Dianne Hackborn [Mon, 18 Jun 2012 23:21:43 +0000 (16:21 -0700)]
am
1991850d: Merge "Implement issue #
6680894: Provide a way to configure app defaults..." into jb-dev
* commit '
1991850de7bbcc534c2cb457f33055c533542136':
Implement issue #
6680894: Provide a way to configure app defaults...
Dianne Hackborn [Mon, 18 Jun 2012 23:19:56 +0000 (16:19 -0700)]
Merge "Implement issue #
6680894: Provide a way to configure app defaults..." into jb-dev
Raph Levien [Mon, 18 Jun 2012 23:17:30 +0000 (16:17 -0700)]
Fix bug
6688060: breakage in AndroidCharacter.mirror
A code cleanup inadvertently changed the semantics of the function,
causing it to return immediately when the first character is mirrored.
This causes CTS test breakage (in
android.text.cts.AndroidCharacterTest). This change restores the earlier
behavior and causes the test to pass.
Change-Id: I68cfb75f1db16eaa72e569dc48fbd0dee06f2de8
Christopher Tate [Mon, 18 Jun 2012 23:00:19 +0000 (16:00 -0700)]
Merge "Fail immediately if bindService() is passed a null ServiceConnection"
Christopher Tate [Mon, 18 Jun 2012 21:54:21 +0000 (14:54 -0700)]
Fail immediately if bindService() is passed a null ServiceConnection
Or if unbindService() is passed one, naturally.
Change-Id: Ib7f1f0b5e12c04e3affbcc9008612801081819d5
Jeff Brown [Mon, 18 Jun 2012 19:58:03 +0000 (12:58 -0700)]
Fix an NPE and possible unsynchronized call of Locked method.
Bug:
6680398
Change-Id: Id5ef4fa82b2a5ef5e9c3934ca95156143f91e5e2
Jim Miller [Sat, 16 Jun 2012 00:26:28 +0000 (17:26 -0700)]
Fix
6665117: ACTION_ASSIST visual improvements
- add generic icon for search providers that don't supply one
- change alpha weighting factor for glow
- don't show ring background
Change-Id: I86c86dc2d623c25ec7b91e206fac8ad9cd60faac
Dianne Hackborn [Mon, 18 Jun 2012 22:38:12 +0000 (15:38 -0700)]
Implement issue #
6680894: Provide a way to configure app defaults...
...for a smoother OOB experience
Way provided.
Put your defaults in system/etc/preferred-apps/*.xml.
Figure out what to put there with "adb shell dumpsys package preferred-xml".
Bug:
6680894
Change-Id: Ia06bb0061876274a5f80bf06d1ba5ad155edc323
Jeff Brown [Mon, 18 Jun 2012 21:20:27 +0000 (14:20 -0700)]
am
81c61fda: am
c4b0d098: Merge "Fix an NPE and possible unsynchronized call of Locked method." into jb-dev
* commit '
81c61fda9a1b45db4c06d2db2cf24b42045d4f76':
Fix an NPE and possible unsynchronized call of Locked method.
Jeff Brown [Mon, 18 Jun 2012 21:17:53 +0000 (14:17 -0700)]
am
c4b0d098: Merge "Fix an NPE and possible unsynchronized call of Locked method." into jb-dev
* commit '
c4b0d098d60ad532cebb3c043f3a1cdb39033f1f':
Fix an NPE and possible unsynchronized call of Locked method.
Jeff Brown [Mon, 18 Jun 2012 21:14:55 +0000 (14:14 -0700)]
Merge "Fix an NPE and possible unsynchronized call of Locked method." into jb-dev
Craig Mautner [Mon, 18 Jun 2012 20:56:32 +0000 (13:56 -0700)]
Merge "More steps to isolate animation."
Jim Miller [Mon, 18 Jun 2012 20:34:59 +0000 (13:34 -0700)]
am
a10b1a73: am
12da2c5e: Merge "Fix
6665117: ACTION_ASSIST visual improvements" into jb-dev
* commit '
a10b1a738dfa8fcf094fec555e7d85dba179f5fc':
Fix
6665117: ACTION_ASSIST visual improvements
Jim Miller [Mon, 18 Jun 2012 20:32:05 +0000 (13:32 -0700)]
am
12da2c5e: Merge "Fix
6665117: ACTION_ASSIST visual improvements" into jb-dev
* commit '
12da2c5eeeadd6c23da5d3003d0da3b6b73d5052':
Fix
6665117: ACTION_ASSIST visual improvements
Jim Miller [Mon, 18 Jun 2012 20:29:49 +0000 (13:29 -0700)]
Merge "Fix
6665117: ACTION_ASSIST visual improvements" into jb-dev
Amith Yamasani [Mon, 18 Jun 2012 20:04:27 +0000 (13:04 -0700)]
Don't backup or delete the backup file, if it's in the backup path.
Change-Id: Ie77782722a271e09f8cbde7fb5393e8127d4334d
Ying Wang [Mon, 18 Jun 2012 20:01:45 +0000 (13:01 -0700)]
am
a5bcf814: (-s ours) am
c4947277: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
a5bcf814166b68ac0cec0d76acb61d49c2e03dc2':
Import translations. DO NOT MERGE
Jeff Brown [Mon, 18 Jun 2012 19:58:03 +0000 (12:58 -0700)]
Fix an NPE and possible unsynchronized call of Locked method.
Bug:
6680398
Change-Id: Id5ef4fa82b2a5ef5e9c3934ca95156143f91e5e2
Ying Wang [Mon, 18 Jun 2012 19:58:59 +0000 (12:58 -0700)]
am
c4947277: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
c4947277e821153fc01256a425e4cbbe34a06eda':
Import translations. DO NOT MERGE
Scott Anderson [Mon, 18 Jun 2012 19:57:05 +0000 (12:57 -0700)]
Merge "Clean up IntToStrings for window TYPE_*"
Ying Wang [Mon, 18 Jun 2012 19:57:03 +0000 (12:57 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Mon, 18 Jun 2012 19:56:44 +0000 (12:56 -0700)]
Merge "Import translations. DO NOT MERGE"
Ying Wang [Mon, 18 Jun 2012 19:44:17 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4da9224e3ede617f1680165966a16e43febc1b8a
Ying Wang [Mon, 18 Jun 2012 19:36:51 +0000 (12:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0108055d8a3aa31fb8157b43e0f2224fab488642
Adam Powell [Mon, 18 Jun 2012 19:13:57 +0000 (12:13 -0700)]
am
12c2fbd3: am
eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev
* commit '
12c2fbd3b7e98132fe1388b065a5dd09c20ef390':
Restrict MediaRouter selection
Adam Powell [Mon, 18 Jun 2012 19:12:00 +0000 (12:12 -0700)]
am
eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev
* commit '
eb2c1b21c6835399fa55227e498fb2930e533439':
Restrict MediaRouter selection
Adam Powell [Mon, 18 Jun 2012 19:10:20 +0000 (12:10 -0700)]
Merge "Restrict MediaRouter selection" into jb-dev
Adam Powell [Mon, 18 Jun 2012 18:51:34 +0000 (11:51 -0700)]
Restrict MediaRouter selection
Actually restrict the programmatic selection of routes by
type. (Oops.)
Change-Id: I91e837f7ecbcddb626c664fb470e8296d563498d
George Mount [Fri, 15 Jun 2012 18:32:13 +0000 (11:32 -0700)]
Broaden allowed selection criteria so selection doesn't disappear.
Bug
6675572
Change-Id: Ic69caac431539247d440c6bac08a3038e8641e99
Svetoslav Ganov [Mon, 18 Jun 2012 18:33:33 +0000 (11:33 -0700)]
am
45c4a8df: am
ec7c7ebf: Merge "API for finding accessibility focus in virtual tree not needed." into jb-dev
* commit '
45c4a8df9487f53af37ded1f5a1ebe500e89b493':
API for finding accessibility focus in virtual tree not needed.
Svetoslav Ganov [Mon, 18 Jun 2012 18:30:09 +0000 (11:30 -0700)]
am
ec7c7ebf: Merge "API for finding accessibility focus in virtual tree not needed." into jb-dev
* commit '
ec7c7ebf01121d17f7a12e827bd77c024eab54e8':
API for finding accessibility focus in virtual tree not needed.
Svetoslav Ganov [Mon, 18 Jun 2012 18:27:44 +0000 (11:27 -0700)]
Merge "API for finding accessibility focus in virtual tree not needed." into jb-dev
Daniel Sandler [Mon, 18 Jun 2012 18:25:41 +0000 (11:25 -0700)]
am
6177c0fb: am
9fba9925: Merge "Turn off debug logs." into jb-dev
* commit '
6177c0fb4f3181866654bd18e02f263f95175fe9':
Turn off debug logs.
Daniel Sandler [Mon, 18 Jun 2012 18:22:47 +0000 (11:22 -0700)]
am
9fba9925: Merge "Turn off debug logs." into jb-dev
* commit '
9fba9925c58f1b34792cd9edc8ad93b22e772f5b':
Turn off debug logs.
Daniel Sandler [Mon, 18 Jun 2012 18:20:54 +0000 (11:20 -0700)]
Merge "Turn off debug logs." into jb-dev
Svetoslav Ganov [Mon, 18 Jun 2012 17:50:08 +0000 (10:50 -0700)]
am
05fa21fa: am
4cb3b76c: Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev
* commit '
05fa21fa77962d302b040f66a1785e0dd84f3e0a':
Ensure WebViewClassic calls super.onHoverEvent()
Justin Ho [Mon, 18 Jun 2012 17:50:00 +0000 (10:50 -0700)]
am
32cd40e6: am
1c1ece1b: Merge "Increasing brightness for notification icons and navigation bar icons Bug:
6612414" into jb-dev
* commit '
32cd40e604591c460e9a35059f8d8c75b21ccd3e':
Increasing brightness for notification icons and navigation bar icons Bug:
6612414
Adam Powell [Mon, 18 Jun 2012 17:49:56 +0000 (10:49 -0700)]
am
c92aa2e7: am
1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev
* commit '
c92aa2e7c9112adafc5283921efe25574a95b7a4':
Volume control in MediaRouter dialogs
Adam Powell [Mon, 18 Jun 2012 17:49:53 +0000 (10:49 -0700)]
am
8f695c52: am
706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev
* commit '
8f695c525f5baa623a8b951bd3a1fd2b5efd1ceb':
Make MediaRouter UI more robust around route count changes
Jeff Brown [Mon, 18 Jun 2012 17:49:50 +0000 (10:49 -0700)]
am
79476980: am
d7a04de1: Capture window manager\'s last ANR state in bug report.
* commit '
7947698096d4b09bb0f662fdca89cfa5d475743e':
Capture window manager's last ANR state in bug report.
Jeff Brown [Mon, 18 Jun 2012 17:49:47 +0000 (10:49 -0700)]
am
23b15320: am
22aa5120: Capture input dispatcher\'s last ANR state in bug report.
* commit '
23b15320ec57f49cb8e87210e37bcd4b146cb204':
Capture input dispatcher's last ANR state in bug report.
Makoto Onuki [Mon, 18 Jun 2012 17:49:44 +0000 (10:49 -0700)]
am
df6d3eeb: am
c4637d3e: Merge "Allow restricting the scope of a phone-filter search" into jb-dev
* commit '
df6d3eebbaa8c0b3cb41aec44b9e212f2d4cdb1a':
Allow restricting the scope of a phone-filter search
Adam Powell [Mon, 18 Jun 2012 17:49:41 +0000 (10:49 -0700)]
am
bb20575f: am
130b4572: ActionProvider API update
* commit '
bb20575f85ada8ccdacefc53f0da7e00fdf12a16':
ActionProvider API update
Dianne Hackborn [Mon, 18 Jun 2012 17:49:38 +0000 (10:49 -0700)]
am
60860192: am
d8bbf96a: Merge "Fix issue #
6664140: Time to lock should work even Stay awake..." into jb-dev
* commit '
608601924651531210ad3c6179d02c471f42dddf':
Fix issue #
6664140: Time to lock should work even Stay awake...
Adam Powell [Mon, 18 Jun 2012 17:49:35 +0000 (10:49 -0700)]
am
772ddc0c: am
fd4df469: Merge "Remove workaround for bug that was fixed a while ago." into jb-dev
* commit '
772ddc0cf28625964435edc5e86048e353c425fa':
Remove workaround for bug that was fixed a while ago.
Jeff Brown [Mon, 18 Jun 2012 17:49:32 +0000 (10:49 -0700)]
am
4440d158: am
5aa02e20: Merge "Revert "Synthesize fake vsyncs when the screen is off."" into jb-dev
* commit '
4440d158b88f948ced442797baffad35743406af':
Revert "Synthesize fake vsyncs when the screen is off."
Jim Miller [Mon, 18 Jun 2012 17:49:28 +0000 (10:49 -0700)]
am
5250db0b: am
b06be57f: Merge "Fix
6507787: fix MMI PUK unlock procedure" into jb-dev
* commit '
5250db0bfd18aacbb6406212a84e3dd101e547e6':
Fix
6507787: fix MMI PUK unlock procedure
Svetoslav Ganov [Mon, 18 Jun 2012 17:49:25 +0000 (10:49 -0700)]
am
11832db4: am
531d5866: Merge "Accessibility focus search and setting it from hover are performed by the client." into jb-dev
* commit '
11832db437d04d71dec9a78382138b2dd6518e37':
Accessibility focus search and setting it from hover are performed by the client.
Ying Wang [Mon, 18 Jun 2012 17:49:22 +0000 (10:49 -0700)]
am
d18d623f: (-s ours) am
c1568fea: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
d18d623fe95ccf1c8aace064d0fcdd2818c19578':
Import translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 17:49:20 +0000 (10:49 -0700)]
am
4f36ed50: (-s ours) am
2f8ee744: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '
4f36ed500f975e1be1dd1246707db60332eaa374':
Import translations. DO NOT MERGE
Dianne Hackborn [Mon, 18 Jun 2012 17:49:15 +0000 (10:49 -0700)]
am
acae5bd3: am
87959cdd: Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev
* commit '
acae5bd34923a79115ad24687558a6ab2ce780ec':
Add new callback for MediaRouter to found out about device changes.
Eric Laurent [Mon, 18 Jun 2012 17:49:12 +0000 (10:49 -0700)]
am
9686f24c: am
c4f4b0f0: Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev
* commit '
9686f24ce3d13446393a468fb3f52283bf2bc80d':
AudioManager: back to old setBluetoothA2dpOn()
Teng-Hui Zhu [Mon, 18 Jun 2012 17:49:09 +0000 (10:49 -0700)]
am
c1d3b23b: am
2075f2d3: Merge "Notify Java side to start when transition into full screen mode without a reload." into jb-dev
* commit '
c1d3b23b54bb044bc2fbff83f1a3816b3a0f276b':
Notify Java side to start when transition into full screen mode without a reload.
Dianne Hackborn [Mon, 18 Jun 2012 17:49:06 +0000 (10:49 -0700)]
am
99e33bf1: am
17b9cec1: Merge "Fix issue #
6636731: Mariner animation ring gets stuck" into jb-dev
* commit '
99e33bf14b2be799efe02b9a8a42b25abc0fced3':
Fix issue #
6636731: Mariner animation ring gets stuck
George Mount [Mon, 18 Jun 2012 17:39:57 +0000 (10:39 -0700)]
Merge "Don't rely on focus change to detect edit-type selection."
Svetoslav Ganov [Mon, 18 Jun 2012 17:36:12 +0000 (10:36 -0700)]
am
4cb3b76c: Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev
* commit '
4cb3b76caa004867bac43f0001072e24bfa8c120':
Ensure WebViewClassic calls super.onHoverEvent()
Justin Ho [Mon, 18 Jun 2012 17:35:37 +0000 (10:35 -0700)]
am
1c1ece1b: Merge "Increasing brightness for notification icons and navigation bar icons Bug:
6612414" into jb-dev
* commit '
1c1ece1bd2ecfa6eacd1a1de8f529e81415f165d':
Increasing brightness for notification icons and navigation bar icons Bug:
6612414
Adam Powell [Mon, 18 Jun 2012 17:34:32 +0000 (10:34 -0700)]
am
1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev
* commit '
1b4dc0fe00805f82fb4bb89a97b6b0501e117505':
Volume control in MediaRouter dialogs
Adam Powell [Mon, 18 Jun 2012 17:34:29 +0000 (10:34 -0700)]
am
706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev
* commit '
706a8699008ce416a7fbd9a4215726fdb00ee803':
Make MediaRouter UI more robust around route count changes
Jeff Brown [Mon, 18 Jun 2012 17:34:25 +0000 (10:34 -0700)]
am
d7a04de1: Capture window manager\'s last ANR state in bug report.
* commit '
d7a04de16798acc04ec0a89a0c7d9f1cf60d1521':
Capture window manager's last ANR state in bug report.
Jeff Brown [Mon, 18 Jun 2012 17:34:21 +0000 (10:34 -0700)]
am
22aa5120: Capture input dispatcher\'s last ANR state in bug report.
* commit '
22aa51202652efbd55094217a046b8e5ecb7afe2':
Capture input dispatcher's last ANR state in bug report.
Makoto Onuki [Mon, 18 Jun 2012 17:33:45 +0000 (10:33 -0700)]
am
c4637d3e: Merge "Allow restricting the scope of a phone-filter search" into jb-dev
* commit '
c4637d3efbbeb3e204691da96c357b5fea4ae2f1':
Allow restricting the scope of a phone-filter search
Adam Powell [Mon, 18 Jun 2012 17:33:19 +0000 (10:33 -0700)]
am
130b4572: ActionProvider API update
* commit '
130b4572d1f3df702e5b296a655d15a41f6d4c66':
ActionProvider API update
Dianne Hackborn [Mon, 18 Jun 2012 17:33:05 +0000 (10:33 -0700)]
am
d8bbf96a: Merge "Fix issue #
6664140: Time to lock should work even Stay awake..." into jb-dev
* commit '
d8bbf96a84cba7c31fa1535fe2467520f2aa0198':
Fix issue #
6664140: Time to lock should work even Stay awake...
Adam Powell [Mon, 18 Jun 2012 17:32:46 +0000 (10:32 -0700)]
am
fd4df469: Merge "Remove workaround for bug that was fixed a while ago." into jb-dev
* commit '
fd4df46917c79067416985ac53a3da6b27e8c333':
Remove workaround for bug that was fixed a while ago.
Jeff Brown [Mon, 18 Jun 2012 17:32:39 +0000 (10:32 -0700)]
am
5aa02e20: Merge "Revert "Synthesize fake vsyncs when the screen is off."" into jb-dev
* commit '
5aa02e20186a9e30553a8ef0d53d5fad4c0b7597':
Revert "Synthesize fake vsyncs when the screen is off."
OSDN Git Service
