Jim Miller
60fd2b2de2
am ddbc85cb: Merge "Fix 6683092: tune GlowPadView wave animation" into jb-dev
...
* commit 'ddbc85cbfdc8ac6ed02b104f0e9c46018a0e1c53':
Fix 6683092: tune GlowPadView wave animation
2012-06-18 17:23:28 -07:00
Jim Miller
ddbc85cbfd
Merge "Fix 6683092: tune GlowPadView wave animation" into jb-dev
2012-06-18 17:22:10 -07:00
Jim Miller
5892e2ec25
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
2012-06-18 17:04:58 -07:00
Amith Yamasani
39758edbed
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.
2012-06-18 16:51:41 -07:00
Amith Yamasani
386ce58a21
Merge "Don't backup or delete the backup file, if it's in the backup path." into jb-dev
2012-06-18 16:49:28 -07:00
Dianne Hackborn
56b3a321e7
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...
2012-06-18 16:21:43 -07:00
Dianne Hackborn
1991850de7
Merge "Implement issue #6680894 : Provide a way to configure app defaults..." into jb-dev
2012-06-18 16:19:56 -07:00
Dianne Hackborn
fc8b7fe026
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
2012-06-18 15:38:12 -07:00
Jeff Brown
81c61fda9a
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.
2012-06-18 14:17:53 -07:00
Jeff Brown
c4b0d098d6
Merge "Fix an NPE and possible unsynchronized call of Locked method." into jb-dev
2012-06-18 14:14:55 -07:00
Jim Miller
a10b1a738d
am 12da2c5e: Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev
...
* commit '12da2c5eeeadd6c23da5d3003d0da3b6b73d5052':
Fix 6665117: ACTION_ASSIST visual improvements
2012-06-18 13:32:05 -07:00
Jim Miller
12da2c5eee
Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev
2012-06-18 13:29:49 -07:00
Amith Yamasani
0ba48a5402
Don't backup or delete the backup file, if it's in the backup path.
...
Change-Id: Ie77782722a271e09f8cbde7fb5393e8127d4334d
2012-06-18 13:04:27 -07:00
Jeff Brown
ee17241487
Fix an NPE and possible unsynchronized call of Locked method.
...
Bug: 6680398
Change-Id: Id5ef4fa82b2a5ef5e9c3934ca95156143f91e5e2
2012-06-18 12:59:13 -07:00
Ying Wang
a5bcf81416
am c4947277: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'c4947277e821153fc01256a425e4cbbe34a06eda':
Import translations. DO NOT MERGE
2012-06-18 12:58:59 -07:00
Ying Wang
c4947277e8
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-18 12:57:03 -07:00
Ying Wang
e3efec74b3
Import translations. DO NOT MERGE
...
Change-Id: I0108055d8a3aa31fb8157b43e0f2224fab488642
2012-06-18 12:36:51 -07:00
Adam Powell
12c2fbd3b7
am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev
...
* commit 'eb2c1b21c6835399fa55227e498fb2930e533439':
Restrict MediaRouter selection
2012-06-18 12:12:00 -07:00
Adam Powell
eb2c1b21c6
Merge "Restrict MediaRouter selection" into jb-dev
2012-06-18 12:10:20 -07:00
Adam Powell
4ee1f55ce0
Restrict MediaRouter selection
...
Actually restrict the programmatic selection of routes by
type. (Oops.)
Change-Id: I91e837f7ecbcddb626c664fb470e8296d563498d
2012-06-18 11:52:17 -07:00
Svetoslav Ganov
45c4a8df94
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.
2012-06-18 11:30:09 -07:00
Svetoslav Ganov
ec7c7ebf01
Merge "API for finding accessibility focus in virtual tree not needed." into jb-dev
2012-06-18 11:27:44 -07:00
Daniel Sandler
6177c0fb4f
am 9fba9925: Merge "Turn off debug logs." into jb-dev
...
* commit '9fba9925c58f1b34792cd9edc8ad93b22e772f5b':
Turn off debug logs.
2012-06-18 11:22:47 -07:00
Daniel Sandler
9fba9925c5
Merge "Turn off debug logs." into jb-dev
2012-06-18 11:20:54 -07:00
Svetoslav Ganov
05fa21fa77
am 4cb3b76c: Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev
...
* commit '4cb3b76caa004867bac43f0001072e24bfa8c120':
Ensure WebViewClassic calls super.onHoverEvent()
2012-06-18 10:36:12 -07:00
Justin Ho
32cd40e604
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
2012-06-18 10:35:37 -07:00
Adam Powell
c92aa2e7c9
am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev
...
* commit '1b4dc0fe00805f82fb4bb89a97b6b0501e117505':
Volume control in MediaRouter dialogs
2012-06-18 10:34:32 -07:00
Adam Powell
8f695c525f
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
2012-06-18 10:34:29 -07:00
Jeff Brown
7947698096
am d7a04de1: Capture window manager\'s last ANR state in bug report.
...
* commit 'd7a04de16798acc04ec0a89a0c7d9f1cf60d1521':
Capture window manager's last ANR state in bug report.
2012-06-18 10:34:25 -07:00
Jeff Brown
23b15320ec
am 22aa5120: Capture input dispatcher\'s last ANR state in bug report.
...
* commit '22aa51202652efbd55094217a046b8e5ecb7afe2':
Capture input dispatcher's last ANR state in bug report.
2012-06-18 10:34:21 -07:00
Makoto Onuki
df6d3eebba
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
2012-06-18 10:33:45 -07:00
Adam Powell
bb20575f85
am 130b4572: ActionProvider API update
...
* commit '130b4572d1f3df702e5b296a655d15a41f6d4c66':
ActionProvider API update
2012-06-18 10:33:19 -07:00
Dianne Hackborn
6086019246
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...
2012-06-18 10:33:05 -07:00
Adam Powell
772ddc0cf2
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.
2012-06-18 10:32:46 -07:00
Jeff Brown
4440d158b8
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."
2012-06-18 10:32:39 -07:00
Jim Miller
5250db0bfd
am b06be57f: Merge "Fix 6507787: fix MMI PUK unlock procedure" into jb-dev
...
* commit 'b06be57f0acf8bb7b8c1767604058c8f061a7b8b':
Fix 6507787: fix MMI PUK unlock procedure
2012-06-18 10:32:29 -07:00
Svetoslav Ganov
11832db437
am 531d5866: Merge "Accessibility focus search and setting it from hover are performed by the client." into jb-dev
...
* commit '531d5866d8e2529e2ae1c6ef12202119753bec03':
Accessibility focus search and setting it from hover are performed by the client.
2012-06-18 10:32:16 -07:00
Ying Wang
d18d623fe9
am c1568fea: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'c1568feaba9f3c4b9f0fab5fcdf062ecb922fcaa':
Import translations. DO NOT MERGE
2012-06-18 10:31:51 -07:00
Ying Wang
4f36ed500f
am 2f8ee744: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '2f8ee7448d6a47178802f9bf00d9e1403b7e7ef9':
Import translations. DO NOT MERGE
2012-06-18 10:31:47 -07:00
Dianne Hackborn
acae5bd349
am 87959cdd: Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev
...
* commit '87959cdd8560e743956a71bb687799e94053e086':
Add new callback for MediaRouter to found out about device changes.
2012-06-18 10:31:29 -07:00
Eric Laurent
9686f24ce3
am c4f4b0f0: Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev
...
* commit 'c4f4b0f0a4905180314d1a681ddf5767ed1070ed':
AudioManager: back to old setBluetoothA2dpOn()
2012-06-18 10:31:22 -07:00
Teng-Hui Zhu
c1d3b23b54
am 2075f2d3: Merge "Notify Java side to start when transition into full screen mode without a reload." into jb-dev
...
* commit '2075f2d3e486b565c9abd2556d81dfb1449f6efb':
Notify Java side to start when transition into full screen mode without a reload.
2012-06-18 10:31:16 -07:00
Dianne Hackborn
99e33bf14b
am 17b9cec1: Merge "Fix issue #6636731 : Mariner animation ring gets stuck" into jb-dev
...
* commit '17b9cec1b6fedd0e54ff61f5a12f0e515add70ab':
Fix issue #6636731 : Mariner animation ring gets stuck
2012-06-18 10:31:05 -07:00
Kenny Root
33ef4ee712
resolved conflicts for merge of 4de60b26 to jb-dev-plus-aosp
...
Change-Id: Id1b1847a3ab5c0f51ac8a732fce5ba12e5810259
2012-06-18 10:26:36 -07:00
Svetoslav Ganov
4cb3b76caa
Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev
2012-06-18 10:20:42 -07:00
Jean-Baptiste Queru
98e955d295
am 20d6caf8: Merge "Fix issue #13366 . Take account of stackFromBottom in computeVerticalScrollOffset()."
...
* commit '20d6caf8888d4114b6ce79d93c7c9cf903ad8c22':
Fix issue #13366 . Take account of stackFromBottom in computeVerticalScrollOffset().
2012-06-18 09:23:55 -07:00
Jean-Baptiste Queru
20d6caf888
Merge "Fix issue #13366 . Take account of stackFromBottom in computeVerticalScrollOffset()."
2012-06-18 08:53:18 -07:00
Daniel Sandler
7a1a406b24
Turn off debug logs.
...
Also switch to Slog, which is more appropriate for framework
logging.
Bug: 6684167
Change-Id: I829de86702a9952ce42ec9967c8d493529253426
2012-06-18 11:26:43 -04:00
Justin Ho
1c1ece1bd2
Merge "Increasing brightness for notification icons and navigation bar icons Bug: 6612414" into jb-dev
2012-06-18 07:29:02 -07:00
Adam Powell
1b4dc0fe00
Merge "Volume control in MediaRouter dialogs" into jb-dev
2012-06-17 19:32:22 -07:00