155259 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Geoff Mendal	43741a8c83	Import translations. DO NOT MERGE ... Change-Id: Ib24cc684af4d1674eef4cffb4232517416f1b9b2 Auto-generated-cl: translation import	2014-12-17 07:43:53 -08:00
Christoph Studer	4328588cb5	am 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs ... * commit '3eff1e1f0e685e1dbb7e2621f5a8ab51a1c321d7': Fix MediaStyle docs mentioning 2 max actions in compact view	2014-12-17 12:28:14 +00:00
Christoph Studer	3eff1e1f0e	am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs ... * commit '92c411b24eaa787158b19b209050ea35fc5070b6': Fix MediaStyle docs mentioning 2 max actions in compact view	2014-12-17 12:22:33 +00:00
Christoph Studer	92c411b24e	Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs	2014-12-17 12:16:48 +00:00
Joe Fernandez	ca27fb9711	am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs ... * commit '6ff265cc882cd7512efcf4736b014ac27e77e5fe': docs: studio revision 21 update	2014-12-17 02:58:28 +00:00
Joe Fernandez	e479dc219f	am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs ... * commit 'f9ea93cdc9791c71f39caeda71d9abc9a91e89d5': docs: studio tools help monkey update	2014-12-17 02:58:25 +00:00
Joe Fernandez	93813012c0	am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs ... * commit 'b8e29d01fb6c7cbadacfd6ada6625dfdc79ec194': docs: help-adt link updates	2014-12-17 02:58:20 +00:00
Sungsoo Lim	d0b09b04b8	am 31d592dc: am cd45de8b: Missing Javadoc update while API review ... * commit '31d592dc1cd9825c06c55562884be37f523350b3': Missing Javadoc update while API review	2014-12-17 02:40:50 +00:00
Joe Fernandez	6ff265cc88	am df916a89: Merge "docs: studio revision 21 update" into lmp-docs ... * commit 'df916a89feba37f8d16bd61101d43be7d1667bf8': docs: studio revision 21 update	2014-12-17 02:28:18 +00:00
Joe Fernandez	f9ea93cdc9	am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs ... * commit '80287e768fd40b61dc4e7b8a0394e1f732805dc9': docs: studio tools help monkey update	2014-12-17 02:28:13 +00:00
Joe Fernandez	df916a89fe	Merge "docs: studio revision 21 update" into lmp-docs	2014-12-17 02:21:50 +00:00
Joe Fernandez	80287e768f	Merge "docs: studio tools help monkey update" into lmp-docs	2014-12-17 02:20:15 +00:00
Joe Fernandez	b8e29d01fb	am 740436b6: Merge "docs: help-adt link updates" into lmp-docs ... * commit '740436b6767aac4c5409b3c9f42ca2606d5ed124': docs: help-adt link updates	2014-12-17 01:55:29 +00:00
Joe Fernandez	740436b676	Merge "docs: help-adt link updates" into lmp-docs	2014-12-17 01:44:22 +00:00
Sungsoo Lim	31d592dc1c	am cd45de8b: Missing Javadoc update while API review ... * commit 'cd45de8ba336d689500c7a65a6a21611cc73d537': Missing Javadoc update while API review	2014-12-17 01:43:16 +00:00
Sungsoo Lim	cd45de8ba3	Missing Javadoc update while API review ... Bug: 18550989 Change-Id: I766986fd429d58064fca6262a1c650cbcb19bddf (cherry picked from commit 4e389e557efb7806b73d2059d46e2809c1a9f83d)	2014-12-16 23:20:04 +00:00
Christopher Tate	be3206ecdc	am 5c3e277f: Fix bad alarm delivery ... * commit '5c3e277fb42bd799287936c5aee0d30fbcc7e65c': Fix bad alarm delivery	2014-12-16 21:04:56 +00:00
Christopher Tate	5c3e277fb4	Fix bad alarm delivery ... The man bent over his hourglass, A programmer of sorts. The day was green. They said, "You have a blue hourglass, You do not fire alarms when they're asked." The man replied, "Alarms as they're asked are changed within the blue hourglass." And they said then, "But fire, you must Alarms beyond us, yet themselves, Alarms within the blue hourglass That trigger exactly when they're asked." --- Fix the delivery-fuzzing semantics that had been introduced in 81f9882b5aadd6a2289c9f521a06a7af5f35ebf0. That patch turned out to be incomplete; in particular, alarms scheduled later might require the validity of an already-scheduled kernel alarm even if they did not affect the head alarm batch directly, and this was not being addressed. For now, roll back the fuzzed delivery logic entirely. (This is not a full revert because that patch also caused exact alarms to be considered standalone for batching purposes, and we need to preserve that new policy.) Bug 18726690 Bug 18765436 This is a 'git revert' of 81f9882b5aadd6a2289c9f521a06a7af5f35ebf0 *except* that this CL preserves the "exact alarms are treated as standalone" portion of the original patch. Change-Id: I54c763775877de5b6eeb5617544aa6100bb17526	2014-12-16 12:48:47 -08:00
Sarah Maddox	8f0f627e0e	am aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs ... * commit 'aaa37da8e0d358317d85e3bc7bfa363c644f5ef1': docs: Updates lesson 1 of location API training: Get last-known location.	2014-12-15 21:57:02 +00:00
Sarah Maddox	aaa37da8e0	am a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs ... * commit 'a158abe4542742381861d1360a79db2cdd28be57': docs: Updates lesson 1 of location API training: Get last-known location.	2014-12-15 21:50:27 +00:00
Sarah Maddox	a158abe454	Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs	2014-12-15 20:42:40 +00:00
Rich Slogar	c819d3df86	docs: studio revision 21 update ... Change-Id: I61a6fa657aae08760a73816d5ad5536957a3be20	2014-12-15 10:46:18 -08:00
smain@google.com	c21b4553cb	am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download ... * commit '16d9a0378fb1c8fbefb263df2e3d627202ae677d': brute force improve suggestions for sdk download	2014-12-15 18:19:05 +00:00
smain@google.com	16d9a0378f	am 68e6819b: brute force improve suggestions for sdk download ... * commit '68e6819bd023d24894fc7cbb2357c685177d9b84': brute force improve suggestions for sdk download	2014-12-15 18:10:45 +00:00
smain@google.com	68e6819bd0	brute force improve suggestions for sdk download ... Change-Id: I4698058a12472a65e67cadc3d0e3dd1ffed1b384	2014-12-15 10:00:59 -08:00
Sarah Maddox	65dc25da3f	docs: Updates lesson 1 of location API training: Get last-known location. ... Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API. Updates the entire tutorial and code sample for clarity and correctness. Bug: 17109822 Change-Id: I759a184a72d50702030b898a5f2e240cd3bdf4be	2014-12-15 16:55:36 +11:00
Rich Slogar	b2a9bd5e9b	am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update ... * commit '895d16945e97e108e33c614f87004c3f1efe5cb4': docs: studio 1.0.1 revision update	2014-12-13 06:24:20 +00:00
Rich Slogar	895d16945e	am 6b8756c3: docs: studio 1.0.1 revision update ... * commit '6b8756c39764b166c9f7d384e4542960dd8a7f98': docs: studio 1.0.1 revision update	2014-12-13 06:17:00 +00:00
Rich Slogar	6b8756c397	docs: studio 1.0.1 revision update ... Change-Id: If9ef9ba986ae02463bec8040924a06ab0ccc8124	2014-12-12 21:19:02 -08:00
smain@google.com	63ed5e1b77	am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs ... * commit '8bb3962b2e58870efa01b2fc0fd8c2a620414974': fix distribute nav styles. they were not highlighted correctly.	2014-12-13 01:12:37 +00:00
smain@google.com	8bb3962b2e	am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs ... * commit '8e8f29e34266b49d02f236367be98d6885f2f8a6': fix distribute nav styles. they were not highlighted correctly.	2014-12-13 01:04:02 +00:00
smain@google.com	8e8f29e342	Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs	2014-12-13 00:55:32 +00:00
Joe Fernandez	d799f75c6b	am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs ... * commit '4234fca655819538fea60cafe2b8bf3e597fa3ea': docs: uiautomator blog link removal	2014-12-13 00:34:20 +00:00
Joe Fernandez	4234fca655	am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs ... * commit '044f3947bc2e5e1beb2e46dd8e32822b57132b4a': docs: uiautomator blog link removal	2014-12-13 00:25:14 +00:00
Joe Fernandez	044f3947bc	Merge "docs: uiautomator blog link removal" into lmp-docs	2014-12-13 00:20:35 +00:00
Joe Fernandez	72268ad3d4	am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs ... * commit 'e70cb874d9a53c6afa78c752ababe8e2f44ba0c8': docs: studio basics typo	2014-12-13 00:16:56 +00:00
Luan Nguyen	bb01880e62	am 47efca78: am a854ddfd: docs: Add two new general functionality requirements ... * commit '47efca783cda4a9f13d172ddfc30443de1d94b91': docs: Add two new general functionality requirements	2014-12-13 00:12:16 +00:00
Joe Fernandez	e70cb874d9	am c59d1d78: Merge "docs: studio basics typo" into lmp-docs ... * commit 'c59d1d780b03b96b3d92990d629de865dd2c585c': docs: studio basics typo	2014-12-13 00:10:17 +00:00
Luan Nguyen	47efca783c	am a854ddfd: docs: Add two new general functionality requirements ... * commit 'a854ddfd79c7d1458452b6238fbc5f69ba610002': docs: Add two new general functionality requirements	2014-12-13 00:04:06 +00:00
Joe Fernandez	c59d1d780b	Merge "docs: studio basics typo" into lmp-docs	2014-12-13 00:03:10 +00:00
Rich Slogar	7789f4dbee	docs: studio basics typo ... Change-Id: I3e20deb2abc8513266cc2182d9be1ae809bbeae0	2014-12-12 15:56:46 -08:00
Luan Nguyen	a854ddfd79	docs: Add two new general functionality requirements ... Bug: 18733124 Change-Id: Ia4b1e74980cbb645d1ab0b61ec56f06a3704fd3b	2014-12-12 15:10:19 -08:00
Mark Renouf	d3adc51a1b	If no display settings are matched, return the first one. DO NOT MERGE ... Language changes will prevent previously saved display settings from being loaded. This provides a fallback in the event a single entry exists but does not match the current (localized) name of the Built-In Display. BUG: 18130296 BUG: 18190800 Change-Id: Ibeff56045fc5713b9f79707dfb92bafc9fadd84f (cherry picked from commit cf0f740e39f79da3fc8367c61ed473273248e8c1)	2014-12-12 18:24:58 +00:00
Christoph Studer	250a141cbe	Fix MediaStyle docs mentioning 2 max actions in compact view ... Bug: 18729304 Change-Id: Ica6b8ac47d7d38b1de62d64830256f66cbbdb225	2014-12-12 18:00:09 +00:00
Rich Slogar	50ff944c02	docs: help-adt link updates ... Change-Id: I60fdea090d330a90ebf12b954fa312dbd49cec29	2014-12-12 09:59:02 -08:00
Bart Sears	08c7233451	Merge "Tune delivery and batching of alarms" into lmp-dev ... automerge: 3ec6a91 * commit '3ec6a91204ffac6e81eaad7ca29e817e9502f856': Tune delivery and batching of alarms	2014-12-12 13:15:38 +00:00
Christopher Tate	a91ef1ec04	Properly recognize repeating wakeup alarms ... automerge: 8965a8d * commit '8965a8da5513cf31a313ecdac3506718c2813932': Properly recognize repeating wakeup alarms	2014-12-12 13:14:30 +00:00
Bart Sears	3ec6a91204	Merge "Tune delivery and batching of alarms" into lmp-dev	2014-12-12 01:52:31 +00:00
Rich Slogar	49d4fdc0c3	docs: uiautomator blog link removal ... Change-Id: I4e5afc42798c4f313d6bdefd5e884fd39c48f469	2014-12-11 16:17:36 -08:00
Christopher Tate	b62aa5530e	Tune delivery and batching of alarms ... cherry-pick from lmp-mr1-dev * Inexact alarms no longer coalesce with exact alarms. The motivation here is that exact alarms are far more likely to be wall-clock aligned, and in general pulling all alarms toward wall-clock alignment is a bad idea. * Wakeup times are now fuzzed within the target batch's allowed window rather than being hard pinned at the start of the window. Bug 18631821 Change-Id: Iefaf34eee3f2a6546abefc27e177ee2fdcff935f (cherry picked from commit 81f9882b5aadd6a2289c9f521a06a7af5f35ebf0)	2014-12-11 23:23:17 +00:00