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
dcf0cc679b
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.
2012-06-18 16:53:39 -07:00
Craig Mautner
75fc9de258
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
2012-06-18 16:53:27 -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
04919812d6
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...
2012-06-18 16:24:03 -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
Raph Levien
e25071650e
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
2012-06-18 16:17:30 -07:00
Christopher Tate
f8fd7ef978
Merge "Fail immediately if bindService() is passed a null ServiceConnection"
2012-06-18 16:00:19 -07:00
Christopher Tate
79b3317b77
Fail immediately if bindService() is passed a null ServiceConnection
...
Or if unbindService() is passed one, naturally.
Change-Id: Ib7f1f0b5e12c04e3affbcc9008612801081819d5
2012-06-18 15:56:33 -07:00
Jeff Brown
cf327449f4
Fix an NPE and possible unsynchronized call of Locked method.
...
Bug: 6680398
Change-Id: Id5ef4fa82b2a5ef5e9c3934ca95156143f91e5e2
2012-06-18 15:53:54 -07:00
Jim Miller
e792d52ace
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
2012-06-18 15:53:53 -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
Kenny Root
ec7e483c55
Packages for PackageManagerService tests
...
Change-Id: I3fd96abb0560fd8c596304d9c233e2f8f3fd8089
2012-06-18 14:31:50 -07:00
Jeff Brown
40af9c04c5
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.
2012-06-18 14:20:27 -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
Craig Mautner
aa9c9efa8f
Merge "More steps to isolate animation."
2012-06-18 13:56:32 -07:00
Jim Miller
048311ca37
am a10b1a73: am 12da2c5e: Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev
...
* commit 'a10b1a738dfa8fcf094fec555e7d85dba179f5fc':
Fix 6665117: ACTION_ASSIST visual improvements
2012-06-18 13:34:59 -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
Ying Wang
d0aebd9009
am a5bcf814: (-s ours) am c4947277: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'a5bcf814166b68ac0cec0d76acb61d49c2e03dc2':
Import translations. DO NOT MERGE
2012-06-18 13:01:45 -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
Scott Anderson
fce27d8edd
Merge "Clean up IntToStrings for window TYPE_*"
2012-06-18 12:57:05 -07:00
Ying Wang
c4947277e8
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-18 12:57:03 -07:00
Ying Wang
601a0b9d5f
Merge "Import translations. DO NOT MERGE"
2012-06-18 12:56:44 -07:00
Ying Wang
9ff1f941be
Import translations. DO NOT MERGE
...
Change-Id: I4da9224e3ede617f1680165966a16e43febc1b8a
2012-06-18 12:44:17 -07:00
Ying Wang
e3efec74b3
Import translations. DO NOT MERGE
...
Change-Id: I0108055d8a3aa31fb8157b43e0f2224fab488642
2012-06-18 12:36:51 -07:00
Adam Powell
987f4a504a
am 12c2fbd3: am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev
...
* commit '12c2fbd3b7e98132fe1388b065a5dd09c20ef390':
Restrict MediaRouter selection
2012-06-18 12:13:57 -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
George Mount
3281c38ec4
Broaden allowed selection criteria so selection doesn't disappear.
...
Bug 6675572
Change-Id: Ic69caac431539247d440c6bac08a3038e8641e99
2012-06-18 11:34:41 -07:00
Svetoslav Ganov
c32b2091d6
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.
2012-06-18 11:33:33 -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
4fd225ca2d
am 6177c0fb: am 9fba9925: Merge "Turn off debug logs." into jb-dev
...
* commit '6177c0fb4f3181866654bd18e02f263f95175fe9':
Turn off debug logs.
2012-06-18 11:25:41 -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
ce252553fd
am 05fa21fa: am 4cb3b76c: Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev
...
* commit '05fa21fa77962d302b040f66a1785e0dd84f3e0a':
Ensure WebViewClassic calls super.onHoverEvent()
2012-06-18 10:50:08 -07:00
Justin Ho
720d88e548
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
2012-06-18 10:50:00 -07:00
Adam Powell
0be17da620
am c92aa2e7: am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev
...
* commit 'c92aa2e7c9112adafc5283921efe25574a95b7a4':
Volume control in MediaRouter dialogs
2012-06-18 10:49:56 -07:00
Adam Powell
9471faf5dc
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
2012-06-18 10:49:53 -07:00
Jeff Brown
91a5f4bef5
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.
2012-06-18 10:49:50 -07:00
Jeff Brown
96d8149fc8
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.
2012-06-18 10:49:47 -07:00
Makoto Onuki
9b6f53c544
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
2012-06-18 10:49:44 -07:00