David Friedman
9da75524d1
am d42e4132: am 233a341b: am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
...
* commit 'd42e4132bafe1b7cf6a665b6a0ed3160fe3ac991':
Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
2013-09-30 14:16:57 -07:00
David Friedman
923f9e90b3
am 3f54532d: am 657343d7: am b648f950: am 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099
...
* commit '3f54532d72d834a41730501f42990c45393b2be1':
Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099
2013-09-30 14:16:53 -07:00
Lajos Molnar
acb1088189
am 974a6e12: Merge "Make SubtitleController thread safe" into klp-dev
...
* commit '974a6e1231f80644e382567c5f0a5fb9b6962d27':
Make SubtitleController thread safe
2013-09-30 14:16:49 -07:00
Raph Levien
ea8b77ae00
am e048f84a: Fix for jank when fast-scrolling DeskClock\'s world cities list in RTL
...
* commit 'e048f84a762d5f85829ceb2b45de52b73727de74':
Fix for jank when fast-scrolling DeskClock's world cities list in RTL
2013-09-30 14:16:32 -07:00
Alan Viverette
182637f6c2
am 015bcd4d: Merge "Add warning about using MergeCursor in CursorAdapter" into klp-dev
...
* commit '015bcd4dd43b850ef209c64dae9c08ccaef9ea80':
Add warning about using MergeCursor in CursorAdapter
2013-09-30 14:14:43 -07:00
Daniel Sandler
a3ea0441d0
am 723ad75e: Merge "API cleanups for Notification." into klp-dev
...
* commit '723ad75e107f57dc541dfca600745895e1251974':
API cleanups for Notification.
2013-09-30 14:14:30 -07:00
John Spurlock
a372f43040
am d01a1b04: Merge "Remove unused views when we return to keyguard" into klp-dev
...
* commit 'd01a1b0473a38bd75555b3138e8e0037fe391d82':
Remove unused views when we return to keyguard
2013-09-30 14:14:15 -07:00
John Spurlock
5eb2504430
am e5b14ee1: Merge "Restore scrim views to former place in view hierarchy." into klp-dev
...
* commit 'e5b14ee1281325dc7e54df3fd820ff4bd830ef3c':
Restore scrim views to former place in view hierarchy.
2013-09-30 14:14:11 -07:00
Jean Chalard
25419efae8
am 5638d29a: Merge "Fix conflicting/unclear documentation in InputConnection." into klp-dev
...
* commit '5638d29a648ee5722bb88355351c56fde7d6bc93':
Fix conflicting/unclear documentation in InputConnection.
2013-09-30 14:14:01 -07:00
Daniel Sandler
7efdabbe26
am a9cf1de4: Merge "Would you like a dessert?" into klp-dev
...
* commit 'a9cf1de470db5910a38f733f4cd089a44d3162c5':
Would you like a dessert?
2013-09-30 14:13:57 -07:00
Jeff Sharkey
1199f70e77
am 10d65592: Merge "Make directories always enabled, for realz." into klp-dev
...
* commit '10d655927c5c10af0561ecc0961f9a9fcbad89f0':
Make directories always enabled, for realz.
2013-09-30 14:13:53 -07:00
Svetoslav
b31aea5fb8
am 25b0151a: Merge "Printers in the list of printers change position." into klp-dev
...
* commit '25b0151a570ff6fb7a6acd9c788b9c3cc9f76be9':
Printers in the list of printers change position.
2013-09-30 14:13:48 -07:00
Craig Mautner
aeccbf7720
am 231bd6c5: Merge "Dismiss keyguard when resuming visible activities" into klp-dev
...
* commit '231bd6c514f15cb0b42a04d4fc7fc9631c743686':
Dismiss keyguard when resuming visible activities
2013-09-30 14:13:38 -07:00
Adam Powell
66d1cd9da1
am 8fb6d97a: Merge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into klp-dev
...
* commit '8fb6d97ad5671b4abc1940d8bc56cf7448e45c35':
Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu
2013-09-30 14:13:35 -07:00
Chet Haase
a16299b1cf
am 033837dd: Merge "Make fading transitions work better" into klp-dev
...
* commit '033837dd6bf32b33d9a67d340efd167f94bf80cf':
Make fading transitions work better
2013-09-30 14:13:27 -07:00
Raph Levien
8ba6752935
am adf14902: Merge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev
...
* commit 'adf149029f701464c66cc5cacbbbc649c1319bcd':
Fix for Text fading on RTL app names is done at the beginning...
2013-09-30 14:12:47 -07:00
Scott Main
b12db27b32
am aaf0f83c: am ef4e5e61: am 194925f9: am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
...
* commit 'aaf0f83c69efd004420633fb577443de80eb35d6':
add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
2013-09-30 14:12:43 -07:00
Jason Monk
179254eb41
am da51d36c: Merge "Fix Sending PAC Broadcast before downloaded" into klp-dev
...
* commit 'da51d36c74f62a1c50f3960919cb74c5da178cd2':
Fix Sending PAC Broadcast before downloaded
2013-09-30 14:12:37 -07:00
Jim Miller
a3b60f56f7
am 398d7f61: Merge "Update navbar camera icon and widget background assets in keyguard." into klp-dev
...
* commit '398d7f61866baab65e69b9107c36ba32bf824353':
Update navbar camera icon and widget background assets in keyguard.
2013-09-30 14:12:17 -07:00
Romain Guy
e3fb7eca81
am 33ed738d: Expose View.executeHardwareAction() Bug #10911502
...
* commit '33ed738d49dce3af5851d0566739e9ed593057a5':
Expose View.executeHardwareAction() Bug #10911502
2013-09-30 14:12:05 -07:00
Craig Mautner
0c5fdaa79b
am c449613e: Merge "Revert behavior to perform onResume." into klp-dev
...
* commit 'c449613ec6ffed7b4605a6708a3341ab2dd5320f':
Revert behavior to perform onResume.
2013-09-30 14:11:41 -07:00
Victoria Lease
8d86033298
am a4eb894a: Merge "clarify Paint flag docs" into klp-dev
...
* commit 'a4eb894a55b07eeddb05d47558e6b2838d56af08':
clarify Paint flag docs
2013-09-30 14:11:32 -07:00
Alan Viverette
32c2b98d27
Merge "Preserve but don't draw accessibility focus for unfocused windows"
2013-09-30 18:13:59 +00:00
David Friedman
d42e4132ba
am 233a341b: am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
...
* commit '233a341b6d9477f7f41d5a954fa7f7a150972ccb':
Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
2013-09-27 15:57:56 -07:00
David Friedman
3f54532d72
am 657343d7: am b648f950: am 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099
...
* commit '657343d782b5ddd8144c724d9131d3f51f39cd8c':
Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099
2013-09-27 15:57:53 -07:00
Lajos Molnar
974a6e1231
Merge "Make SubtitleController thread safe" into klp-dev
2013-09-27 22:57:22 +00:00
Michael Wright
5b6803c913
Merge "Move EventHub over to using EPOLLWAKEUP when available"
2013-09-27 22:48:32 +00:00
Elliott Hughes
cfd9a2c1db
am 917f88f0: am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs."
...
* commit '917f88f033aafb89cbb77feda2932cf88698a56a':
Regenerate all the OpenGL stubs.
2013-09-27 15:44:14 -07:00
Elliott Hughes
917f88f033
am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs."
...
* commit '82e5d8758a61f1a49700f67f6ddb69219528bad2':
Regenerate all the OpenGL stubs.
2013-09-27 15:41:25 -07:00
Elliott Hughes
82e5d8758a
am ebd397ad: Merge "Regenerate all the OpenGL stubs."
...
* commit 'ebd397ad9182c37487ba95aaa71ae6dcf0c9d762':
Regenerate all the OpenGL stubs.
2013-09-27 15:37:56 -07:00
Elliott Hughes
ebd397ad91
Merge "Regenerate all the OpenGL stubs."
2013-09-27 22:33:25 +00:00
Lajos Molnar
29f5183794
Make SubtitleController thread safe
...
Add the concept of an anchor looper.
Allow show/hide/selectTrack/selectDefaultTrack to be called from thread
other than anchor looper.
Change-Id: Iaf2f3d3c46d1b00a0a24156745ec16b301c80c04
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10919206
2013-09-27 14:55:36 -07:00
Raph Levien
e048f84a76
Fix for jank when fast-scrolling DeskClock's world cities list in RTL
...
This is a fix for bug 10863979.
The onPreDraw() method in TextView was canceling the draw every time a
the horizontal scroll changed. These dropped frames were visible as
jank. The fix is to never cancel the draw. It seems likely that the
previous rationale for canceling draw is no longer valid, due to other
fixes, because the scroll state will have been fully updated.
Change-Id: I8c2da5450723f993055a49b1cb57320c08f2a11e
2013-09-27 13:36:24 -07:00
Alan Viverette
015bcd4dd4
Merge "Add warning about using MergeCursor in CursorAdapter" into klp-dev
2013-09-27 18:03:47 +00:00
David Friedman
233a341b6d
am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
...
* commit '1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f':
Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
2013-09-27 10:37:07 -07:00
David Friedman
657343d782
am b648f950: am 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099
...
* commit 'b648f9509b17bad806c907ffa5270901a86e6c06':
Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099
2013-09-27 10:33:15 -07:00
David Friedman
1b8e319784
am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
...
* commit '8c38ea39203016dde95bc5dd68f27f6f45096784':
Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994
2013-09-27 10:30:01 -07:00
David Friedman
b648f9509b
am 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099
...
* commit '23bd5927f1c82f3f63288fbee4e7c460fca3dc4e':
Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099
2013-09-27 10:26:23 -07:00
David Friedman
8c38ea3920
Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs
2013-09-27 17:24:41 +00:00
David Friedman
36b692d8ef
Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file.
...
Bug: 10807931 10796994
Change-Id: I8c8e07c3e8606d5983c2545fa6638af45650d27c
2013-09-27 10:04:48 -07:00
Nick Kralevich
3d28abf392
am 19db8894: am 19f9f445: am 7a56d949: Merge "Fix SELinux.java doc errors"
...
* commit '19db889424addfdf2eae9e3dac1c97d93e13cb74':
Fix SELinux.java doc errors
2013-09-27 09:40:09 -07:00
Nick Kralevich
19db889424
am 19f9f445: am 7a56d949: Merge "Fix SELinux.java doc errors"
...
* commit '19f9f445bfe368f801f893aad6dbd372562746ac':
Fix SELinux.java doc errors
2013-09-27 09:37:56 -07:00
Nick Kralevich
19f9f445bf
am 7a56d949: Merge "Fix SELinux.java doc errors"
...
* commit '7a56d949ef524d00e4091827104ac2450e4ec9db':
Fix SELinux.java doc errors
2013-09-27 09:35:01 -07:00
Nick Kralevich
7a56d949ef
Merge "Fix SELinux.java doc errors"
2013-09-27 16:32:57 +00:00
Daniel Sandler
723ad75e10
Merge "API cleanups for Notification." into klp-dev
2013-09-27 16:08:45 +00:00
Daniel Sandler
cf1d39b178
API cleanups for Notification.
...
- Calling build() on a Style now goes through the same
codepath as calling build() on the Builder.
- Documented new constants and unhidden classes.
- Fixed crash in Action.clone().
Bug: 10112103
Bug: 10461196
Change-Id: I08cd94790b538a361ccf8ff3682f6a86a7812b95
2013-09-27 11:58:58 -04:00
John Spurlock
d01a1b0473
Merge "Remove unused views when we return to keyguard" into klp-dev
2013-09-27 14:32:38 +00:00
John Spurlock
e5b14ee128
Merge "Restore scrim views to former place in view hierarchy." into klp-dev
2013-09-27 14:27:38 +00:00
John Spurlock
256ae67b9a
Restore scrim views to former place in view hierarchy.
...
By enabling KeyguardHostView to extend into the full screen area
and updating custom measure/layout in the Challenge layouts
appropriately.
Bug:10939005
Change-Id: I06fb187c4100cf0f2e48b1206cc4450afa4567dd
2013-09-27 10:19:12 -04:00
David Friedman
23bd5927f1
Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed.
...
Bug: 10796099
Change-Id: Ideb1dbf70b9034e88683ef19ec1a3d338b7ea06b
2013-09-26 22:30:11 -07:00