Justin Koh
674db142c5
am 44643269: Merge "Make tap events less sensitive." into jb-mr1-aah-dev
...
* commit '446432692a2a7e60c7f547d6c7436922eb571d8e':
Make tap events less sensitive.
2012-11-12 10:24:21 -08:00
Justin Koh
446432692a
Merge "Make tap events less sensitive." into jb-mr1-aah-dev
2012-11-12 10:20:43 -08:00
Ben Pietrzak
ffb5bdef63
Make tap events less sensitive.
...
Change-Id: I4d6f70b56373fbc51a414510897854078eeb0c40
2012-11-12 10:11:52 -08:00
John Spurlock
4299f63e54
am b340fe4f: am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
...
* commit 'b340fe4f88226ec35f0a4058f514b764b0f3977d':
Disable navbar searchlight if search assist not available.
2012-11-12 07:58:09 -08:00
John Spurlock
b340fe4f88
am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
...
* commit 'f6f47e950ddbb91fcce30f2f3e610a4d249b9bdb':
Disable navbar searchlight if search assist not available.
2012-11-12 07:55:24 -08:00
John Spurlock
f6f47e950d
Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
2012-11-12 07:52:08 -08:00
Andy McFadden
9d42794dde
am a7113f70: am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev
...
* commit 'a7113f70c55517b5dbf3c54827c4559304faff4f':
Reduce emulator logspam
2012-11-09 22:45:26 -08:00
Andy McFadden
a7113f70c5
am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev
...
* commit '798de53cf454595a3a494d26dfa3f08518c24e55':
Reduce emulator logspam
2012-11-09 22:41:51 -08:00
John Spurlock
43d84518f2
Disable navbar searchlight if search assist not available.
...
Bug:7506441
Change-Id: I55c740d4c3a45b9f7fdfa38346d1bc3fb1299153
2012-11-09 10:27:33 -05:00
Andy McFadden
325be8a1ea
Reduce emulator logspam
...
The emulator doesn't support systrace, but we should point that out
at most once per process.
Bug 7436352
Change-Id: I30e0094dc3b24bc3ab6bc2799ce81ca0a6bb7d9d
2012-11-08 16:40:21 -08:00
Jim Miller
061b4fae3d
am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515':
Add mechanism to kick keyguard to show the assistant
2012-11-08 15:47:04 -08:00
Satoshi Kataoka
ae41ba1563
am 4424951f: am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev
...
* commit '4424951fa566b3bf6e57b08f615facc680059164':
Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
2012-11-08 15:44:26 -08:00
Justin Koh
3e94c56215
am cd38c32d: Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev
...
* commit 'cd38c32d85c13fde87ca7bee501cbe35230078b6':
Catch exception of nonfound activities
2012-11-08 15:43:34 -08:00
Daniel Sandler
7f83ef619a
am ccbfd617: am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
...
* commit 'ccbfd617e730e5c3660fb3b9edf4f272db4abfd0':
Fix docs to refer to the correct class.
2012-11-08 15:42:51 -08:00
Romain Guy
11d43794b9
am de60dd2d: 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 'de60dd2d136557ff7dce52c37625c4475ef42e7d':
Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
2012-11-08 15:34:12 -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
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
Jim Miller
a2bf6181df
am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit '2c29deaa2650091d9206b8fa93f8a447ee247d52':
Add mechanism to kick keyguard to show the assistant
2012-11-08 13:13:23 -08:00
Jim Miller
2c29deaa26
am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit '6be441c532688762b735ae2a1276195b40bf33b4':
Add mechanism to kick keyguard to show the assistant
2012-11-08 13:08:41 -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
Jim Miller
4eeb4f664a
Add mechanism to kick keyguard to show the assistant
...
Fixes bug 7499778
Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
2012-11-08 00:39:04 -08:00
Satoshi Kataoka
4424951fa5
am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev
...
* commit '1e29e49cf8b2654f999b2fdb16e8f7f262b73c68':
Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
2012-11-07 20:50:37 -08:00
Satoshi Kataoka
1e29e49cf8
Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev
2012-11-07 20:48:01 -08:00
Justin Koh
cd38c32d85
Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev
2012-11-07 17:10:24 -08:00
Ben Pietrzak
6b1d912b25
Catch exception of nonfound activities
...
Change-Id: Id019c71937e73c38eb7a7c0a0cccfc2b9e87d069
2012-11-07 15:07:18 -08:00
Daniel Sandler
ccbfd617e7
am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
...
* commit '7b5a92766a0b04af7cb6a9e9905ec37e7885ea64':
Fix docs to refer to the correct class.
2012-11-07 12:40:30 -08:00
Daniel Sandler
7b5a92766a
am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
...
* commit 'afc5210a811da3824d75e32d998370203aba1968':
Fix docs to refer to the correct class.
2012-11-07 12:37:28 -08:00
Daniel Sandler
afc5210a81
Merge "Fix docs to refer to the correct class." into jb-mr1-dev
2012-11-07 12:35:01 -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
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
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
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
Romain Guy
59d73ab6fc
Merge "Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774 " into jb-mr1-dev
2012-11-07 11:15:36 -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
Daniel Sandler
8768278974
Fix docs to refer to the correct class.
...
Bug: 6676920
Change-Id: Ib79635cb3ff464b4686268fcf64b99cacaa9e627
2012-11-07 14:04:42 -05: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