Commit Graph

155233 Commits

Author SHA1 Message Date
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
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 cf0f740e39)
2014-12-12 18:24:58 +00: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 81f9882b5a)
2014-12-11 23:23:17 +00:00
Christopher Tate
8965a8da55 Properly recognize repeating wakeup alarms
cherry-pick from lmp-mr1-dev

The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral.  Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.

Bug 18591317

Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427
(cherry picked from commit 864d42eb96)
2014-12-11 23:22:41 +00:00
David Friedman
d0d76540ae am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit 'c82392df7caa12836d97650c7528f216d3c2b76f':
  Adds link to related video.
2014-12-11 22:10:48 +00:00
David Friedman
c82392df7c am 1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit '1ab615b3e6a7ae820fde4ba067f76dff635f3639':
  Adds link to related video.
2014-12-11 22:03:42 +00:00
David Friedman
1ab615b3e6 Merge "Adds link to related video." into lmp-docs 2014-12-11 21:55:25 +00:00
Joe Fernandez
c9014b6d59 am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
* commit 'ea500a3adf6bcf17ad22f05acd8c3220358f72ce':
  docs: studio basics haxm updates
2014-12-11 19:59:00 +00:00
Joe Fernandez
ea500a3adf am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
* commit '0aa234457737cdb31538711251920aef3a70bb56':
  docs: studio basics haxm updates
2014-12-11 19:50:39 +00:00
Ricardo Cervera
64d97cb2ad am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
* commit '6621a4f6f9c63ff952c5e64a5ae1e41ef5ac5960':
  docs: Fixes to watch faces docs.
2014-12-11 19:43:25 +00:00
Joe Fernandez
0aa2344577 Merge "docs: studio basics haxm updates" into lmp-docs 2014-12-11 19:43:18 +00:00
Ricardo Cervera
6621a4f6f9 am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
* commit '9fe34d9037dc27abb89c64ff75b87fdf9a4eaa8b':
  docs: Fixes to watch faces docs.
2014-12-11 19:35:41 +00:00
Ricardo Cervera
9fe34d9037 Merge "docs: Fixes to watch faces docs." into lmp-docs 2014-12-11 19:28:41 +00:00
Rich Slogar
b490f29710 am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs
* commit '5c853c26a879c411a98e1530247a41a856f7784c':
  docs: studio bundle update
2014-12-11 19:17:05 +00:00
Rich Slogar
5c853c26a8 am d35216ad: Merge "docs: studio bundle update" into lmp-docs
* commit 'd35216ad36aefb121167ad781b25f7a37d5c1e52':
  docs: studio bundle update
2014-12-11 19:09:39 +00:00
Rich Slogar
d35216ad36 Merge "docs: studio bundle update" into lmp-docs 2014-12-11 19:04:03 +00:00
Rich Slogar
2f8f42f897 docs: studio bundle update
Change-Id: I232a61ae6747b879e8a36f8e4942d6a3406c4162
2014-12-11 10:51:41 -08:00
Rich Slogar
d282ba778b docs: studio basics haxm updates
Change-Id: I2c3ef0dae3a091be27f1cfef13fe385f97781492
2014-12-11 10:03:19 -08:00
Ricardo Cervera
ad69082b50 docs: Fixes to watch faces docs.
Bug: 18705470
Bug: 18702859
Bug: 18713266

Change-Id: I67f159f3b54a03f08aa1cd4bf3aa40eec4a34631
2014-12-11 09:17:45 -08:00
Joe Fernandez
5c518b7f01 am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
* commit 'b32987ec2f8fbe887be4a6f4ed9a17f8e0a8cf22':
  docs: platform updates for api 21
2014-12-11 00:45:20 +00:00
Joe Fernandez
b64545c83a am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
* commit '378c71a39187c333fd1be83a1b1d77e195ccdd2a':
  docs: sdk tools 24.0.1 revisions
2014-12-11 00:37:10 +00:00
Andrew Solovay
a97053fd0b am f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
* commit 'f43c057ca611e9d86e365fd90eceec22cdaffac8':
  docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-11 00:37:06 +00:00
Joe Fernandez
b32987ec2f am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
* commit 'c3daed967d5ad6b4df8547679c30c4d2efd005b3':
  docs: platform updates for api 21
2014-12-11 00:36:53 +00:00
Joe Fernandez
c3daed967d Merge "docs: platform updates for api 21" into lmp-docs 2014-12-11 00:31:54 +00:00
Joe Fernandez
378c71a391 am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
* commit '235e4be4c92fbc68544f15bebcc6a92ab5d21183':
  docs: sdk tools 24.0.1 revisions
2014-12-11 00:29:19 +00:00
Andrew Solovay
f43c057ca6 am c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
* commit 'c7ad6e9175e232416c22386b80f2c5c9b5031d81':
  docs: Added info about managed profiles to "Android 5.0 Changes"
2014-12-11 00:29:14 +00:00
Joe Fernandez
235e4be4c9 Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs 2014-12-11 00:27:02 +00:00
Andrew Solovay
c7ad6e9175 docs: Added info about managed profiles to "Android 5.0 Changes"
Also a couple of unrelated changes while the file was open.

See first comment for link to staged doc.

Change-Id: I56dd57104729dec353b0dd630715a43a73d043d3
2014-12-10 16:08:23 -08:00