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 |
|
John Spurlock
|
5d5613651e
|
am 66453ff5: am 506fd3b0: Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev
* commit '66453ff5348cc169591805c29cda3d046c19f842':
Low battery dialog should use UserHandle.CURRENT.
|
2012-11-07 11:37:25 -08:00 |
|
John Spurlock
|
66453ff534
|
am 506fd3b0: Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev
* commit '506fd3b02ef4b036aceb66db76ca93c55254bfcf':
Low battery dialog should use UserHandle.CURRENT.
|
2012-11-07 11:34:47 -08:00 |
|
Baligh Uddin
|
658e350daf
|
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
2012-11-07 11:33:07 -08:00 |
|
John Spurlock
|
506fd3b02e
|
Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev
|
2012-11-07 11:31:30 -08:00 |
|
Baligh Uddin
|
d5ef55df10
|
Import translations. DO NOT MERGE
Change-Id: Ia17c77e31bea23907d9d28a0d12acf4ed9040eb6
Auto-generated-cl: translation import
|
2012-11-07 11:31:14 -08:00 |
|
Romain Guy
|
de60dd2d13
|
am fcd7ad4e: am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774" into jb-mr1-dev
* commit 'fcd7ad4e28df6a408e84c6d2b2f425b029efbfbe':
Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
|
2012-11-07 11:22:43 -08:00 |
|
Roman Nurik
|
a62316b393
|
am 081e6b7d: am 0fc1b5ec: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '081e6b7daf8cbdaec7ae0ad626880a4576031e38':
|
2012-11-07 11:20:26 -08:00 |
|
Baligh Uddin
|
19068c088b
|
am dac8d6d9: am a40ec75e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'dac8d6d999617936c1c0c59926351a538c70931c':
Import translations. DO NOT MERGE
|
2012-11-07 11:20:22 -08:00 |
|
Daniel Sandler
|
334d66ed41
|
am 6f562e9f: am 1b803450: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev
* commit '6f562e9fabb2dd35997708963a0e7935c19aea7b':
Show the assist ring on center-button longpress on lockscreen.
|
2012-11-07 11:20:19 -08:00 |
|
Baligh Uddin
|
9310aa1886
|
am b38b3ed1: (-s ours) am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'b38b3ed1235eab98942a79ad8037dbdc8e42f409':
Import translations. DO NOT MERGE
|
2012-11-07 11:20:15 -08:00 |
|
Romain Guy
|
fcd7ad4e28
|
am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774" into jb-mr1-dev
* commit '59d73ab6fcc80b9e08ff06cfc13617a2f65af60e':
Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
|
2012-11-07 11:18:55 -08:00 |
|
Chris Wren
|
193cd46c47
|
am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
* commit '53d819687e29ea8b400f4852295fbec3fabb9f7b':
Don't pop the IME for passwors at ScreenOn on tablets.
|
2012-11-07 11:18:21 -08:00 |
|
Brian Colonna
|
1e85c8edfb
|
am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev
* commit '9885568eb7b85f743ff7c8a1503251a54ed9ea73':
Centering FUL fixes b/7480608
|
2012-11-07 11:18:17 -08:00 |
|
John Spurlock
|
1ef6398e93
|
am 3dcb3628: am 34c4fe52: Fix remaining jank in secure add-widget transition.
* commit '3dcb3628c74d430631eb57bf0829f560a9c50499':
Fix remaining jank in secure add-widget transition.
|
2012-11-07 11:18:09 -08:00 |
|
Michael Jurka
|
5dc8ce48d8
|
am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
* commit 'c70379347e2a1bc469da10149f8d443ab7c94468':
Allowing rotation while adding lockscreen widgets
|
2012-11-07 11:18:06 -08:00 |
|
Adam Cohen
|
580657a348
|
am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
* commit '96c3f7e5f21c6b38d00dd259941d8c72c2283160':
Giving glow pad the brains to scale itself dynamically (issue 7449554)
|
2012-11-07 11:18:03 -08:00 |
|
Adam Powell
|
e7394d1eef
|
am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking
* commit '3c0a353a05555819394d74795b9825c7210c3e1d':
Keyguard layout tweaking/reworking
|
2012-11-07 11:17:59 -08:00 |
|
Daniel Sandler
|
f6a5070bf5
|
am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev
* commit 'f74cac46991cb46dc6e80a02f0c3a83dc5ed12ed':
Updated assets.
|
2012-11-07 11:17:55 -08:00 |
|
Jim Miller
|
63ef8dc030
|
am 52bf955e: am 9d0d796f: Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev
* commit '52bf955e3e5b0a752b65e5af657c6706c067cd08':
Fix emergency call area updates.
|
2012-11-07 11:17:50 -08:00 |
|