Justin Koh
|
5d1a9a902e
|
am 4608a0ae: am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
* commit '4608a0aec230a1a4857b54354afc3f233af7c1f2':
Support new touchpad event protocol.
|
2012-11-08 06:18:15 -08:00 |
|
Justin Koh
|
b892e8c642
|
am a1459793: am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
* commit 'a1459793d4e2ea483deb8baa733abbac56c2c199':
Trigger Google Now intent with swipe from bottom
|
2012-11-08 06:18:07 -08:00 |
|
Amith Yamasani
|
cb2f707f86
|
am cb5cb740: am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit 'cb5cb740b587744150df7414bdc2974144e9167a':
Authenticate correct user's account when pattern fails multiple times.
|
2012-11-08 06:17:59 -08:00 |
|
Svetoslav Ganov
|
f3e03e234f
|
am dc564945: am 7ccb2806: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit 'dc564945bb7382768e28e45c6fc2452e3f4d9da9':
Make partially visible widget pages not important for accessibility.
|
2012-11-08 06:14:37 -08:00 |
|
Irfan Sheriff
|
37794c200f
|
am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
* commit 'f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
Stop supplicant and dhcp before start
|
2012-11-08 06:14:33 -08:00 |
|
Sascha Prueter
|
f107bda0ad
|
am a517fc3a: am ee8fab8b: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit 'a517fc3a393b075a677ef3052e22749951ede8fa':
Use a consistent policy for filtering wake keys.
|
2012-11-08 06:14:25 -08:00 |
|
Romain Guy
|
a965fc5e8f
|
am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
* commit 'b37e5d756f04489ff95226e26ebfdf141d135f91':
Dismiss error icon on setError(null) [regression] Bug #7442935
|
2012-11-08 06:14:11 -08:00 |
|
Eino-Ville Talvala
|
f4334f63c5
|
am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit '9671e6e116bbb8a82784457382cab3f90289e31b':
Camera: Document new video snapshot picture size behavior.
|
2012-11-08 06:14:01 -08:00 |
|
Victoria Lease
|
44d927ca83
|
am 66f3d7f3: am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit '66f3d7f3c8247b59516cbc4ad13bea4e0b8c0ef9':
Fires geofence if the device is already in the geofence area.
|
2012-11-08 06:13:21 -08:00 |
|
Robert Greenwalt
|
744c520472
|
am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
* commit '08db1ceba24925cd8a710aa0153519351a9fa2c7':
Add Coin graphic to premium-sms dialog.
|
2012-11-08 06:13:17 -08:00 |
|
The Android Open Source Project
|
7139007202
|
am 927372ae: am f3456803: Reconcile with jb-mr1-release - do not merge
* commit '927372aec399b7c63d193c57c69b57065e7b66e5':
|
2012-11-08 06:12:45 -08:00 |
|
Justin Koh
|
4608a0aec2
|
am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
* commit '41048d670d42075732723e72d7f303498690ea99':
Support new touchpad event protocol.
|
2012-11-08 06:12:30 -08:00 |
|
Justin Koh
|
a1459793d4
|
am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
* commit '58e0fb9adbe579a068849a7865a7f1bce7531d1c':
Trigger Google Now intent with swipe from bottom
|
2012-11-08 06:12:26 -08:00 |
|
Amith Yamasani
|
cb5cb740b5
|
am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit 'aecee8a98543118dacec14a94052243754560e9d':
Authenticate correct user's account when pattern fails multiple times.
|
2012-11-08 06:12:21 -08:00 |
|
John Spurlock
|
426b050c43
|
am 805337ab: resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp
* commit '805337ab5fb2adf108726b351319d77007577bb4':
Remove add widget transition jank (insecure).
|
2012-11-08 05:58:09 -08:00 |
|
John Spurlock
|
805337ab5f
|
resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp
Change-Id: Iad4319796be4b9ad74580f8c20a4e8cb30569f87
|
2012-11-08 07:43:15 -05:00 |
|
John Spurlock
|
0b435ae59e
|
am 9a962d7c: am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition.
* commit '9a962d7c7df9ff762e3d9798cde868ad73b164db':
Fix regression in camera transition.
|
2012-11-07 15:10:20 -08:00 |
|
Michael Jurka
|
eebf218ad4
|
am e4cc20d1: am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
* commit 'e4cc20d1148addab9f6f27bad70b3f6d437ea06c':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
|
2012-11-07 15:10:16 -08:00 |
|
Jim Miller
|
9210016ff9
|
am 449f48ff: am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
* commit '449f48ff3bc99544ecf1676ed15a4126beea1f1e':
Workaround for layout bug in SIM PIN/PUK views
|
2012-11-07 15:10:12 -08:00 |
|
Jim Miller
|
91cc386e55
|
am d3bd6eb8: am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
* commit 'd3bd6eb8b2f348c19fbbe79a11c0dc9aa5f27637':
Fix NPE caused by applications that try to hide keyguard while it's not showing
|
2012-11-07 15:10:08 -08:00 |
|
Svetoslav Ganov
|
d80d13b3c2
|
am 63121bd6: am ab77b5e6: am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
* commit '63121bd6c14a80fe839c617e8fb11cf07d490cc1':
|
2012-11-07 15:10:04 -08:00 |
|
Mike Cleron
|
b8a9ec3e1c
|
am fe583a70: am d97d16f0: am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
* commit 'fe583a70248709289e3865de62fdc34c92d393b3':
|
2012-11-07 15:10:00 -08:00 |
|
Romain Guy
|
c60d328b63
|
am 39fe96c7: am c4101b2b: am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev
* commit '39fe96c7b8ec870e7fa30893f0b4f41fa796b55d':
|
2012-11-07 15:09:56 -08:00 |
|
John Spurlock
|
9a962d7c7d
|
am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition.
* commit '64091a1da0e87937ad42c8ae0d5e3dd3913b297b':
Fix regression in camera transition.
|
2012-11-07 15:06:45 -08:00 |
|
Michael Jurka
|
e4cc20d114
|
am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
* commit '7dfbe2d6a7a3d6f11d522f44b5339c7a6d3f2a1b':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
|
2012-11-07 15:06:41 -08:00 |
|
Jim Miller
|
449f48ff3b
|
am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
* commit 'bb9e7dcae96c8913050166c9cc949e9f1c3c8d1f':
Workaround for layout bug in SIM PIN/PUK views
|
2012-11-07 15:06:37 -08:00 |
|
Jim Miller
|
d3bd6eb8b2
|
am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
* commit '16ddf343a61dfc93ff9a6fc4721b8fb16010da48':
Fix NPE caused by applications that try to hide keyguard while it's not showing
|
2012-11-07 15:06:33 -08:00 |
|
Svetoslav Ganov
|
63121bd6c1
|
am ab77b5e6: am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
* commit 'ab77b5e6a251075fdfc7990f4d34a8d5896cfbce':
|
2012-11-07 15:06:29 -08:00 |
|
Mike Cleron
|
fe583a7024
|
am d97d16f0: am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
* commit 'd97d16f0d1693657938a9c08099ad352d0946b6f':
|
2012-11-07 15:06:26 -08:00 |
|
Romain Guy
|
39fe96c7b8
|
am c4101b2b: am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev
* commit 'c4101b2b96d7958e26da5a7b3d14cc2540f8002a':
|
2012-11-07 15:06:22 -08:00 |
|
Jean-Baptiste Queru
|
f5a79d313e
|
am 476fceab: Merge 5418dd92
* commit '476fceaba3e8c8d5b775fc07ad098792fc757f76':
Adding bouncer animation on PagedView. (Bug 7459660)
|
2012-11-07 14:54:34 -08:00 |
|
Jean-Baptiste Queru
|
476fceaba3
|
Merge 5418dd92
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
|
2012-11-07 14:41:18 -08:00 |
|
Mike Lockwood
|
13d9d4ffaf
|
Merge "SerialManager: Only allow opening files that are whitelisted serial port devices"
|
2012-11-07 14:04:55 -08:00 |
|
Kenny Root
|
7b172a49a9
|
am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
Correct executable bit for source files
|
2012-11-07 13:08:25 -08:00 |
|
Elliott Hughes
|
e4d08f11c4
|
am 9197d170: am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT."
* commit '9197d170b770f2b87abd0cd0e13dcf71e5a181c2':
It's 2012. We're always WITH_JIT.
|
2012-11-07 13:08:11 -08:00 |
|
Kenny Root
|
58ed5d748c
|
am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
Correct executable bit for source files
|
2012-11-07 11:52:12 -08:00 |
|
Kenny Root
|
768d9e1a72
|
Merge "Correct executable bit for source files"
|
2012-11-07 11:45:14 -08:00 |
|
Adam Powell
|
f2d7c67f94
|
am de565f3b: am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev
* commit 'de565f3bcbae9bf8643650b9c20abe67252629d6':
Keyguard - MultiPaneChallengeLayout measurement/layout changes
|
2012-11-07 11:17:22 -08:00 |
|
Victoria Lease
|
b69c08a832
|
am b000c362: am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit 'b000c36207d5d0eb1e983e9eae93f863faa29c97':
|
2012-11-07 11:17:19 -08:00 |
|
Chris Wren
|
f5dc0a19ac
|
am 888322a6: am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev
* commit '888322a659ba9ea330562df5592a2491a1494894':
animating challenge closed should close the challenge.
|
2012-11-07 11:17:15 -08:00 |
|
Winson Chung
|
267214f4e6
|
am 43ecd191: am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions.
* commit '43ecd1912c18347aae3bb99e25ac7af1e893c003':
Using screen dimensions to calculate the expanded PagedView dimensions.
|
2012-11-07 11:17:12 -08:00 |
|
Jim Miller
|
c7dc250d5a
|
am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
* commit 'fe7e94a094746b608eb926fadc3ee1446bbb0d58':
Add isSafeModeEnabled() API to WindowManagerService
|
2012-11-07 11:17:08 -08:00 |
|
Danielle Millett
|
ae54cd6e3d
|
am 2f4be247: am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev
* commit '2f4be247b647cdbe433ff35d30aa54b131e6bd2a':
Removing callbacks in onDetachedFromWindow, fixes b/7465673
|
2012-11-07 11:17:04 -08:00 |
|
Adam Cohen
|
e5785461b7
|
am 441d3401: am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
* commit '441d3401bfd9b30a82b7104eeb644d39ccf44a93':
Making sure the sticky widget logic works with music
|
2012-11-07 11:17:01 -08:00 |
|
Adam Cohen
|
d50f206a08
|
am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
* commit 'a7af02098a0192b36e98c5ab809fd0f6eae9ce21':
Attempted fix for issue 7469415
|
2012-11-07 11:16:57 -08:00 |
|
Amith Yamasani
|
9862ac9c69
|
am 22559dc5: am 5eac4d85: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit '22559dc5bffc159e171b2ca81414416a59c0f54d':
|
2012-11-07 11:16:52 -08:00 |
|
Chris Wren
|
66425daffc
|
am 950f947c: am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev
* commit '950f947cea6890799ccd4e45e7cb2cf8b2283fcf':
make challengeShowing sticky across bounce.
|
2012-11-07 11:16:49 -08:00 |
|
Chris Wren
|
ac20bfe178
|
am 98f95b3a: am f7e47a00: Merge "specify start value: Drawables don\'t have getAlpha(). also, some clean up." into jb-mr1-lockscreen-dev
* commit '98f95b3af1ce00bc02ae18d76ee9aab278f57e04':
specify start value: Drawables don't have getAlpha(). also, some clean up.
|
2012-11-07 11:16:42 -08:00 |
|
Adam Powell
|
de565f3bcb
|
am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev
* commit '7136544c06c2d10c7a1c6aa8715d2b717221aee8':
Keyguard - MultiPaneChallengeLayout measurement/layout changes
|
2012-11-07 11:14:04 -08:00 |
|
Victoria Lease
|
b000c36207
|
am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit '8d803258ca1550583d03c1a24c5c6d4b38535ba8':
|
2012-11-07 11:14:01 -08:00 |
|