Baligh Uddin
|
3d6d75bd47
|
am 19068c08: am dac8d6d9: am a40ec75e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '19068c088bf27defe64fe183cf133b1dee9adbcb':
Import translations. DO NOT MERGE
|
2012-11-08 15:33:45 -08:00 |
|
Daniel Sandler
|
591272848a
|
am 334d66ed: am 6f562e9f: am 1b803450: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev
* commit '334d66ed41bbeb3456ee1366428076e85c875b7d':
Show the assist ring on center-button longpress on lockscreen.
|
2012-11-08 15:33:41 -08:00 |
|
Baligh Uddin
|
a1a229daa2
|
am 9310aa18: am b38b3ed1: (-s ours) am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '9310aa18865221ea8bf16345565313cc71f2d5f2':
Import translations. DO NOT MERGE
|
2012-11-08 15:33:35 -08:00 |
|
Chris Wren
|
1ed908ec37
|
am 193cd46c: am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
* commit '193cd46c47e7552c6b92b20aef51064d87e88d84':
Don't pop the IME for passwors at ScreenOn on tablets.
|
2012-11-08 15:33:31 -08:00 |
|
Brian Colonna
|
318e81896b
|
am 1e85c8ed: am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev
* commit '1e85c8edfb39aa951134599b6019a7fa4fc8b4a7':
Centering FUL fixes b/7480608
|
2012-11-08 15:33:27 -08:00 |
|
John Spurlock
|
b4119441a0
|
am 1ef6398e: am 3dcb3628: am 34c4fe52: Fix remaining jank in secure add-widget transition.
* commit '1ef6398e93eefe08ae7195e83f04910610568f28':
Fix remaining jank in secure add-widget transition.
|
2012-11-08 15:33:20 -08:00 |
|
Michael Jurka
|
9d15b4cb70
|
am 5dc8ce48: am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
* commit '5dc8ce48d80c339070b626903a57846d4357c2f2':
Allowing rotation while adding lockscreen widgets
|
2012-11-08 15:33:16 -08:00 |
|
Adam Cohen
|
0c06c2b35c
|
am 580657a3: am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
* commit '580657a34851c29f013586578241d2f4d6dc4f5d':
Giving glow pad the brains to scale itself dynamically (issue 7449554)
|
2012-11-08 15:33:13 -08:00 |
|
Adam Powell
|
c4e0614bca
|
am e7394d1e: am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking
* commit 'e7394d1eef3ef8a89ec6ceea8f0318f38ac67b33':
Keyguard layout tweaking/reworking
|
2012-11-08 15:33:09 -08:00 |
|
Daniel Sandler
|
744fa85f12
|
am f6a5070b: am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev
* commit 'f6a5070bf59ecc5497196f923930d28286b49287':
Updated assets.
|
2012-11-08 15:33:05 -08:00 |
|
Jim Miller
|
f920a2729b
|
am 63ef8dc0: am 52bf955e: am 9d0d796f: Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev
* commit '63ef8dc03021faeb51af22868fcf7631f9383a1a':
Fix emergency call area updates.
|
2012-11-08 15:33:01 -08:00 |
|
Adam Cohen
|
416d486248
|
am 24d230e9: am 16a3f4c9: am 42164efa: Merge "Ensuring bindAppWidget isn\'t called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev
* commit '24d230e9e972451b15326c819247163132709796':
Ensuring bindAppWidget isn't called until boot completed (issue 7469267)
|
2012-11-08 15:32:57 -08:00 |
|
Michael Jurka
|
d31bc8ca2c
|
am f1424272: am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
* commit 'f142427244dde3e467b126df4840f496e09cef56':
Removing sticky widgets in lockscreen
|
2012-11-08 15:32:53 -08:00 |
|
Svetoslav Ganov
|
a8bc8a5a98
|
am 00a0ed03: am 1cbb449c: am ad9f594e: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit '00a0ed03b2f740666d60b75b44b8c5ab21910a02':
|
2012-11-08 15:32:49 -08:00 |
|
Sascha Prueter
|
586f02f7d1
|
am 7286ff58: am 62855332: am bc69698c: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit '7286ff586b6be315045bb15392651065d634dfc3':
|
2012-11-08 15:32:46 -08:00 |
|
Jim Miller
|
fcb8042316
|
am 8920c259: am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
* commit '8920c259c8f5c63e4fae40f00afb185daa8008fb':
Handle DevicePolicyManagement and safe mode when inflating widgets
|
2012-11-08 15:32:40 -08:00 |
|
Romain Guy
|
9f6f38aeb8
|
am 4e889f00: am 96f6491a: am 475255bf: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
* commit '4e889f008b148ab8d557c4d1d77bdb715a401383':
|
2012-11-08 15:32:36 -08:00 |
|
Eino-Ville Talvala
|
077b81ff83
|
am 75dd6d2f: am f83ace0b: am 688d98fe: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit '75dd6d2fa180af352ed55b24a0ebc83a6a3f552a':
|
2012-11-08 15:32:32 -08:00 |
|
Adam Powell
|
412545f7f0
|
am f2d7c67f: am de565f3b: am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev
* commit 'f2d7c67f946deb6ba3ba224f1e4d2f3454058da2':
Keyguard - MultiPaneChallengeLayout measurement/layout changes
|
2012-11-08 15:32:24 -08:00 |
|
Victoria Lease
|
e006945d34
|
am b69c08a8: am b000c362: am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit 'b69c08a832a9b5d45273bcf694d7177f23b734f7':
|
2012-11-08 15:32:20 -08:00 |
|
Chris Wren
|
e2b6a93596
|
am f5dc0a19: am 888322a6: am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev
* commit 'f5dc0a19acd17d827b932e78373530508ea70fe4':
animating challenge closed should close the challenge.
|
2012-11-08 15:32:17 -08:00 |
|
Winson Chung
|
b10df88b02
|
am 267214f4: am 43ecd191: am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions.
* commit '267214f4e63f0cf01918a4f491d40b79dcb6ab57':
Using screen dimensions to calculate the expanded PagedView dimensions.
|
2012-11-08 15:32:13 -08:00 |
|
Jim Miller
|
bef827572c
|
am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
* commit 'c7dc250d5a3dab93ff87e9986a71ae58ff124399':
Add isSafeModeEnabled() API to WindowManagerService
|
2012-11-08 15:32:09 -08:00 |
|
Danielle Millett
|
6b646e8205
|
am ae54cd6e: am 2f4be247: am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev
* commit 'ae54cd6e3d34bebb344156e36ba2a78c0a3cdf72':
Removing callbacks in onDetachedFromWindow, fixes b/7465673
|
2012-11-08 15:32:05 -08:00 |
|
Adam Cohen
|
4d6d5f185c
|
am e5785461: am 441d3401: am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
* commit 'e5785461b753f68258c9609754f158f3dbf5fb26':
Making sure the sticky widget logic works with music
|
2012-11-08 15:32:01 -08:00 |
|
Adam Cohen
|
1b19b519e6
|
am d50f206a: am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
* commit 'd50f206a08663c05dbe6c14918c6eef61df0bc97':
Attempted fix for issue 7469415
|
2012-11-08 15:31:57 -08:00 |
|
Amith Yamasani
|
fda301cf75
|
am 9862ac9c: am 22559dc5: am 5eac4d85: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit '9862ac9c6979f6bc65a7c8ccfb9166588dac1ee7':
|
2012-11-08 15:31:50 -08:00 |
|
Chris Wren
|
abbf79c6f5
|
am 66425daf: am 950f947c: am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev
* commit '66425daffc4442693a0dddb6323362877507cc28':
make challengeShowing sticky across bounce.
|
2012-11-08 15:31:42 -08:00 |
|
Jean-Baptiste Queru
|
21fc49ac74
|
Merge commit 'ac20bfe1' into HEAD
|
2012-11-08 14:51:15 -08:00 |
|
Jean-Baptiste Queru
|
c23cfe57a9
|
Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD
|
2012-11-08 14:48:54 -08:00 |
|
Jean-Baptiste Queru
|
87a1ac66ad
|
Merge commit '805337ab5fb2adf108726b351319d77007577bb4' into HEAD
|
2012-11-08 14:48:43 -08:00 |
|
Jean-Baptiste Queru
|
32f504729b
|
Merge commit 'ef44a77f9181c13140c67988356b3ed3f5177434' into HEAD
|
2012-11-08 14:48:36 -08:00 |
|
Jean-Baptiste Queru
|
5189fca3df
|
Merge commit '9a962d7c7df9ff762e3d9798cde868ad73b164db' into HEAD
|
2012-11-08 14:48:28 -08:00 |
|
Jean-Baptiste Queru
|
d931827f86
|
Merge commit '476fceaba3e8c8d5b775fc07ad098792fc757f76' into HEAD
|
2012-11-08 14:44:51 -08:00 |
|
Jean-Baptiste Queru
|
de8717c5f2
|
Merge commit '5418dd92ac6a0e60493ea85d9ac3a0f0d6155908' into HEAD
|
2012-11-08 14:44:44 -08:00 |
|
Jean-Baptiste Queru
|
40a419c2a5
|
Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD
|
2012-11-08 14:44:35 -08:00 |
|
Jean-Baptiste Queru
|
4fb3c16cad
|
Merge commit 'ecf372213db4a1e12f07b4684f3357a838b90daa' into HEAD
|
2012-11-08 14:40:42 -08:00 |
|
Jean-Baptiste Queru
|
d35f576ea0
|
Merge commit 'eead92749924e47ba6758bbded560b6aab0d7485' into HEAD
|
2012-11-08 14:40:34 -08:00 |
|
Jean-Baptiste Queru
|
8d3d0250c4
|
Merge commit '432c71d77e376c948b6e287b2b6b2d134e1f2a11'
Change-Id: Iafcba7225e662bc2c3a3c113a1b36656889e2f18
|
2012-11-08 14:40:12 -08:00 |
|
Jean-Baptiste Queru
|
432c71d77e
|
Merge commit '063de3b93e543d9073e14542eb0a60385fd74fa5'
Change-Id: I9ba212785fdb7c3ac92fad33d8a5ff6eefc3c7bc
|
2012-11-08 14:29:45 -08:00 |
|
Jean-Baptiste Queru
|
ce2a3746b8
|
merge 19f8aa180a7ccb29b11a322378002e37517abfc9
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
|
2012-11-08 14:13:21 -08:00 |
|
The Android Open Source Project
|
f4488d0312
|
am a4d8f804: am a8540f2a: Reconcile with jb-mr1-release - do not merge
* commit 'a4d8f804688deb939a37e5aaf0bab40520548b33':
|
2012-11-08 06:27:02 -08:00 |
|
Roman Nurik
|
4b214cddb0
|
am 7a00ac7c: am a93f94d3: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '7a00ac7cb74e957bed6580cc209f8035cd34f58d':
docs: Minor Nexus 10 fix in Device Art Generator
|
2012-11-08 06:26:51 -08:00 |
|
Baligh Uddin
|
c1bd157f50
|
am d98e6dc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'd98e6dc68021dad263783a0f21e3f861589eb694':
Import translations. DO NOT MERGE
|
2012-11-08 06:26:45 -08:00 |
|
Baligh Uddin
|
b7232a2e45
|
am 20040daf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '20040dafbc5f0a0b432d9c41c2da6d7ba7791327':
Import translations. DO NOT MERGE
|
2012-11-08 06:26:41 -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 |
|