Michael Jurka
069d5ee9ac
am 9d15b4cb: am 5dc8ce48: am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
...
* commit '9d15b4cb70e0141bb5fe4e266bb505b4f84eb1ec':
Allowing rotation while adding lockscreen widgets
2012-11-08 15:38:07 -08:00
Adam Cohen
df8a020c61
am 0c06c2b3: am 580657a3: am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
...
* commit '0c06c2b35c50a8391fb95e8f9b277e0b9899c1c1':
Giving glow pad the brains to scale itself dynamically (issue 7449554)
2012-11-08 15:38:03 -08:00
Michael Jurka
7df23b0c51
am d31bc8ca: am f1424272: am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
...
* commit 'd31bc8ca2ce4c1288f14cf650944c9b65a588b72':
Removing sticky widgets in lockscreen
2012-11-08 15:37:43 -08:00
Jim Miller
7779c83a36
am fcb80423: am 8920c259: am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
...
* commit 'fcb8042316bad141cab189de6dfacd60e8d09848':
Handle DevicePolicyManagement and safe mode when inflating widgets
2012-11-08 15:37:30 -08:00
Jim Miller
d97b09b0f3
am bef82757: am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
...
* commit 'bef827572ce9644253ea42ab91b11b8107d2300f':
Add isSafeModeEnabled() API to WindowManagerService
2012-11-08 15:37:01 -08:00
Adam Cohen
1c2576ae18
am 1b19b519: am d50f206a: am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
...
* commit '1b19b519e659783236661fecf22f4f8897742dc3':
Attempted fix for issue 7469415
2012-11-08 15:36:45 -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
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
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
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
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
Jean-Baptiste Queru
7c8d2b63c0
Merge from jb-mr1-dev-plus-aosp
...
Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3
2012-11-08 15:19:11 -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
40a419c2a5
Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD
2012-11-08 14:44:35 -08:00
Jean-Baptiste Queru
8d3d0250c4
Merge commit '432c71d77e376c948b6e287b2b6b2d134e1f2a11'
...
Change-Id: Iafcba7225e662bc2c3a3c113a1b36656889e2f18
2012-11-08 14:40:12 -08:00
Jean-Baptiste Queru
ce2a3746b8
merge 19f8aa180a
...
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
2012-11-08 14:13:21 -08:00
Irfan Sheriff
8449bb0378
am 37794c20: am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
...
* commit '37794c200fa24e622d842d420b49a2a2a87a38bb':
Stop supplicant and dhcp before start
2012-11-08 06:18:47 -08:00
Romain Guy
18d9a26941
am a965fc5e: am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935 " into jb-mr1-dev
...
* commit 'a965fc5e8f0c84cbeeaae7006eddbaf3bba64586':
Dismiss error icon on setError(null) [regression] Bug #7442935
2012-11-08 06:18:40 -08:00
Eino-Ville Talvala
f0352e03fd
am f4334f63: am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
...
* commit 'f4334f63c5162035ead3b44131c48015dfc6be58':
Camera: Document new video snapshot picture size behavior.
2012-11-08 06:18:36 -08:00
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
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
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
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
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
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
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
Michael Jurka
f142427244
am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
...
* commit '1aad5be9161397db505c2812c1a8279421c245c3':
Removing sticky widgets in lockscreen
2012-11-07 11:17:43 -08:00
Jim Miller
8920c259c8
am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
...
* commit '259e3121d301c29112dad028931d9d477264be96':
Handle DevicePolicyManagement and safe mode when inflating widgets
2012-11-07 11:17:33 -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
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
Michael Jurka
c70379347e
am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
...
* commit 'cabcc5900790daaa9ca4d080848c9b505c3de126':
Allowing rotation while adding lockscreen widgets
2012-11-07 11:14:45 -08:00
Adam Cohen
96c3f7e5f2
am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
...
* commit '1361758f90e3c247e2da953913ef424041d1c847':
Giving glow pad the brains to scale itself dynamically (issue 7449554)
2012-11-07 11:14:41 -08:00
Michael Jurka
1aad5be916
am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
...
* commit '835579e8173700be78368827d5c042ac4f698e29':
Removing sticky widgets in lockscreen
2012-11-07 11:14:24 -08:00
Jim Miller
259e3121d3
am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
...
* commit '51117262c8fadb6d227d137e83ad66996b013141':
Handle DevicePolicyManagement and safe mode when inflating widgets
2012-11-07 11:14:14 -08:00
Jim Miller
fe7e94a094
am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
...
* commit '088fb915f73584fbeaf05f5cbaa95b8a944b94cb':
Add isSafeModeEnabled() API to WindowManagerService
2012-11-07 11:13:48 -08:00
Adam Cohen
a7af02098a
am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
...
* commit '0e1608c0277155c49f78a0f6980e5c5cb9afc0b8':
Attempted fix for issue 7469415
2012-11-07 11:13:34 -08:00
Kenny Root
3a084af2e9
Correct executable bit for source files
...
Many media files and source code files were marked as executable in Git.
Remove those.
Also a shell script and python script were not marked as executable.
Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
2012-11-07 10:27:31 -08:00
Michael Jurka
cabcc59007
Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
2012-11-07 01:16:11 -08:00
Michael Jurka
192d6d4ee2
Allowing rotation while adding lockscreen widgets
...
Also cleaning up some unused code
Bug: 7468012
2012-11-07 01:12:26 -08:00
Adam Cohen
e41dd0f195
Giving glow pad the brains to scale itself dynamically (issue 7449554)
...
Change-Id: I44f31d354171c01b607871d6a9e1e9d06a49ffc8
2012-11-06 23:06:44 -08:00
Michael Jurka
76017cad4f
Removing sticky widgets in lockscreen
...
Also adding mechanism to show a widget after
adding it
Change-Id: Ic4d49e6ef1343c38fa731b0ed2a327c55b678abf
2012-11-06 18:56:41 -08:00
Irfan Sheriff
f264e8e34e
am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
...
* commit '567a2919f3ad66dcb972e45411d18a4515d9f0b1':
Stop supplicant and dhcp before start
2012-11-06 17:43:05 -08:00
Irfan Sheriff
567a2919f3
Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
2012-11-06 17:39:46 -08:00
