Elliott Hughes
32393fd82a
am 591e8ae3: am b4d1ad29: Merge "Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)"
...
* commit '591e8ae307e2faf18974254899989ca0ce31e5a5':
Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)
2013-10-01 10:54:22 -07:00
Elliott Hughes
591e8ae307
am b4d1ad29: Merge "Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)"
...
* commit 'b4d1ad29c00b6d7f66192f91fcac359981102185':
Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)
2013-10-01 10:51:22 -07:00
Elliott Hughes
b4d1ad29c0
Merge "Added missing permission declaration on <service> tag of AccessibilityService guide documentation (Building Accessibility Services)"
2013-10-01 17:49:16 +00:00
Matthew Williams
0e0f600379
am 508a57f5: Merge "Remove blocking from SM before boot completed." into klp-dev
...
* commit '508a57f58f873efcabc4d771b5f11285193685f6':
Remove blocking from SM before boot completed.
2013-10-01 05:26:42 -07:00
Alan Viverette
ed2cfdbf42
am 6f07cc84: Merge "Rebind transient state views when available" into klp-dev
...
* commit '6f07cc8424caccda695918f83e1b57f7a67d9f0c':
Rebind transient state views when available
2013-10-01 05:26:40 -07:00
Amith Yamasani
32ff8c14b2
am f55cf7fc: Merge "Adjust padding for keyguard pin entry keys" into klp-dev
...
* commit 'f55cf7fcd991124b76063c5c9aed2d3833eff084':
Adjust padding for keyguard pin entry keys
2013-10-01 05:26:37 -07:00
Robert Greenwalt
2b6b3d9c49
am bad5d694: Merge "Use a build-specific wifi country code" into klp-dev
...
* commit 'bad5d694c7d7ae27ca966d6da059f81c5d964748':
Use a build-specific wifi country code
2013-10-01 05:26:34 -07:00
Jim Miller
102f0e05ba
am 8b3bc51c: Merge "Disable keyguard widgets on low memory devices" into klp-dev
...
* commit '8b3bc51c8f03b2877e834fb1a739eb729a7ad8a1':
Disable keyguard widgets on low memory devices
2013-10-01 05:26:31 -07:00
Adam Powell
6d0c46fc8b
am 81517c86: Merge "Make toast frames a little more opaque" into klp-dev
...
* commit '81517c86a14d2b2b0c9fac81b607067d8d05042c':
Make toast frames a little more opaque
2013-10-01 05:26:28 -07:00
Matthew Xie
9eb9ebb2fb
am 0e772b22: Merge "Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields" into klp-dev
...
* commit '0e772b226801ca03292abad04677b1f7f29fade4':
Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields
2013-09-30 17:32:22 -07:00
Craig Mautner
7d4e6365fb
am 312ab4bd: Merge "Don\'t display hidden activities over home screen." into klp-dev
...
* commit '312ab4bd2928b152e1f7732a1699677b7df54b2f':
Don't display hidden activities over home screen.
2013-09-30 17:32:19 -07:00
Carlos Valdivia
d8d900086a
am d6957d5f: Merge "Prevent authenticators from using Settings to launch arbitrary activities." into klp-dev
...
* commit 'd6957d5f8ddf3b542996955bf2d6efe0e9804ef4':
Prevent authenticators from using Settings to launch arbitrary activities.
2013-09-30 17:11:14 -07:00
Jake Hamby
5a8b2c3bc6
am 65cacb3c: Merge "Add android.provider.Telephony to public API." into klp-dev
...
* commit '65cacb3c5174f93debd481c7d573f34bc36f80f4':
Add android.provider.Telephony to public API.
2013-09-30 17:11:09 -07:00
Daniel Sandler
0caebb5078
am 026dc143: Merge "Fix configuration changes in status bars." into klp-dev
...
* commit '026dc1432ef70308ef44dafcc28998436e304e75':
Fix configuration changes in status bars.
2013-09-30 17:11:03 -07:00
Dianne Hackborn
e2a67ac27b
am 57d96f0e: Merge "Fix issue #10948509 : Crash in procstats when there is no data" into klp-dev
...
* commit '57d96f0e92e8af842878660a8271e65cec2426d3':
Fix issue #10948509 : Crash in procstats when there is no data
2013-09-30 17:10:55 -07:00
Svetoslav Ganov
8a7d8f9722
am 0ed01ab5: Merge "Printers in the list of printers change position." into klp-dev
...
* commit '0ed01ab57f1277a3889da10daa87733c1af6e0d0':
Printers in the list of printers change position.
2013-09-30 17:10:46 -07:00
Craig Mautner
92af22f0d0
am 564e8e6f: Merge "Ensure correct window ordering." into klp-dev
...
* commit '564e8e6f548951c9fe5825aaad327b9ffbeece82':
Ensure correct window ordering.
2013-09-30 17:10:43 -07:00
Craig Mautner
5b291397e1
am 64ce6b78: Merge "Don\'t kill home process with the rest of its package." into klp-dev
...
* commit '64ce6b78ccb8522a6147843f4206a5b128571b03':
Don't kill home process with the rest of its package.
2013-09-30 17:10:39 -07:00
Craig Mautner
75a3b301e9
am 5a0c54a5: Merge "Remove home package name methods." into klp-dev
...
* commit '5a0c54a5112612777becd7a0f12f74cf720c1b7f':
Remove home package name methods.
2013-09-30 17:10:36 -07:00
Svetoslav
82d2d7e4b0
am c6568719: Merge "Ignore historical printer records for installed services" into klp-dev
...
* commit 'c6568719671206e726f260fad390680f7fb0ee9e':
Ignore historical printer records for installed services
2013-09-30 17:10:21 -07:00
Adam Powell
cf0a11594b
am 43a372f3: Keyguard transport controls: fullscreen art
...
* commit '43a372f38ad642f86047e8112e3d43edb7300439':
Keyguard transport controls: fullscreen art
2013-09-30 17:10:18 -07:00
Jim Miller
aaee139ced
am 1ae85153: Merge "Fix missing transport in keyguard" into klp-dev
...
* commit '1ae85153c804553365d18715824fd3a569f8ce18':
Fix missing transport in keyguard
2013-09-30 17:10:15 -07:00
Jim Miller
a192253bf2
am fb2e3c8d: Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev
...
* commit 'fb2e3c8d47c162166a029a97d68ad3bedff89cce':
Fix permissions on WindowManagerService.showAssistant()
2013-09-30 17:10:11 -07:00
Svetoslav Ganov
b84aa9fee3
am b415525a: Merge "Print job files and print job records not always cleaned up." into klp-dev
...
* commit 'b415525a16074b6dc8e295655648b7c7c1074bbb':
Print job files and print job records not always cleaned up.
2013-09-30 17:10:08 -07:00
Craig Mautner
98b96d2c42
am 16e6e203: Merge "Centralize handleAppDied and fix return to home." into klp-dev
...
* commit '16e6e203c0c86a1cbc1a7c1cf20cb5447f705a32':
Centralize handleAppDied and fix return to home.
2013-09-30 17:10:02 -07:00
Adam Lesinski
4056c94adf
am 0c923b7c: Merge "Add badging of Payment apps" into klp-dev
...
* commit '0c923b7ce1f4e40b401bcd342f4ee4399f4ad9d7':
Add badging of Payment apps
2013-09-30 17:09:58 -07:00
Adam Lesinski
db239f91d6
am 5223a5ff: Merge "Add support for dumping new badging" into klp-dev
...
* commit '5223a5ff24bed6d0a0ac618083a3ed050bdd98b2':
Add support for dumping new badging
2013-09-30 17:09:54 -07:00
Svetoslav Ganov
fb83af78fa
am c783f673: Merge "Adding a timeout for waiting to get the selected printer\'s capabilities." into klp-dev
...
* commit 'c783f6738f0f6d2cb57702cfbc9219c59a3410a3':
Adding a timeout for waiting to get the selected printer's capabilities.
2013-09-30 17:09:51 -07:00
Jeff Sharkey
a2c42861a1
am cc637d9a: Merge "New roots UX, async, performance, docs." into klp-dev
...
* commit 'cc637d9ae5920ac2f685090f595dc1e1643d71cc':
New roots UX, async, performance, docs.
2013-09-30 17:09:48 -07:00
Michael Wright
426700c39f
am edb444b4: Merge "Add missing constructor parameter to KeyEvent" into klp-dev
...
* commit 'edb444b44419def54292cf8325c22697213153fa':
Add missing constructor parameter to KeyEvent
2013-09-30 17:09:46 -07:00
Zhijun He
aa98c43d68
am 9552f9b8: Merge "Camera2: remove CameraDevice#getProperties" into klp-dev
...
* commit '9552f9b8c2bc6d671809514cb402cbc48ee2e323':
Camera2: remove CameraDevice#getProperties
2013-09-30 17:09:41 -07:00
Scott Main
db173e8143
am 3fd40b9a: am 584d4f69: am 57177492: am 4a9999f1: remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
...
* commit '3fd40b9acb49a2953a014ac929db6b6d7ef12f16':
remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
2013-09-30 17:09:23 -07:00
Amith Yamasani
a1770e634a
am 797df438: am 01c2e173: (-s ours) am 49039929: am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
...
* commit '797df43849fd79c05f3a56bdc62748c38e7a182c':
Don't instantiate non-Fragments in Fragment.instantiate
2013-09-30 17:09:19 -07:00
David Friedman
e466eeab10
am 4feebfc4: am afd85f82: am c6d085a5: am 37453a83: Merge "Docs: Changed" into jb-mr2-docs
...
* commit '4feebfc427803378d7fad0488b238715fbe435ec':
Docs: Changed
2013-09-30 17:09:16 -07:00
David Friedman
b2f8ca238e
am 6f3193f7: am f0a5a844: am 165489da: am 2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs
...
* commit '6f3193f78d8a28c763e136d1d19208e6dcd68270':
Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902
2013-09-30 17:09:13 -07:00
David Friedman
63ca3cd30d
am 4778aff0: am ff379fc4: am 707bac2b: am 0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360" into jb-mr2-docs
...
* commit '4778aff02fe0df20ee5393fa739beca0b048e5a4':
Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360
2013-09-30 17:09:11 -07:00
David Friedman
7dd32457f6
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 17:09:08 -07:00
David Friedman
23cd7f4274
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 17:09:05 -07:00
Lajos Molnar
a5c95f6fe3
am 974a6e12: Merge "Make SubtitleController thread safe" into klp-dev
...
* commit '974a6e1231f80644e382567c5f0a5fb9b6962d27':
Make SubtitleController thread safe
2013-09-30 17:09:03 -07:00
Raph Levien
e5207a41c3
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 17:08:48 -07:00
Alan Viverette
c4ff1f3ad4
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 17:08:22 -07:00
Daniel Sandler
5e833d6f57
am 723ad75e: Merge "API cleanups for Notification." into klp-dev
...
* commit '723ad75e107f57dc541dfca600745895e1251974':
API cleanups for Notification.
2013-09-30 17:08:06 -07:00
John Spurlock
847f4e0e1b
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 17:07:53 -07:00
John Spurlock
7e6774402e
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 17:07:50 -07:00
Jean Chalard
db90713899
am 5638d29a: Merge "Fix conflicting/unclear documentation in InputConnection." into klp-dev
...
* commit '5638d29a648ee5722bb88355351c56fde7d6bc93':
Fix conflicting/unclear documentation in InputConnection.
2013-09-30 17:07:23 -07:00
Daniel Sandler
c6f82e9d05
am a9cf1de4: Merge "Would you like a dessert?" into klp-dev
...
* commit 'a9cf1de470db5910a38f733f4cd089a44d3162c5':
Would you like a dessert?
2013-09-30 17:07:20 -07:00
Jeff Sharkey
fa9c7ec0ee
am 10d65592: Merge "Make directories always enabled, for realz." into klp-dev
...
* commit '10d655927c5c10af0561ecc0961f9a9fcbad89f0':
Make directories always enabled, for realz.
2013-09-30 17:07:17 -07:00
Svetoslav
049e69070a
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 17:07:13 -07:00
Craig Mautner
768836b116
am 231bd6c5: Merge "Dismiss keyguard when resuming visible activities" into klp-dev
...
* commit '231bd6c514f15cb0b42a04d4fc7fc9631c743686':
Dismiss keyguard when resuming visible activities
2013-09-30 17:07:07 -07:00
Adam Powell
e7dee824cf
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 17:07:03 -07:00