OSDN Git Service

android-x86/frameworks-base.git
9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 17 Dec 2014 15:43:53 +0000 (07:43 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ib24cc684af4d1674eef4cffb4232517416f1b9b2
Auto-generated-cl: translation import

9 years agoam 3eff1e1f: am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in...
Christoph Studer [Wed, 17 Dec 2014 12:28:14 +0000 (12:28 +0000)]
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

9 years agoam 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view...
Christoph Studer [Wed, 17 Dec 2014 12:22:33 +0000 (12:22 +0000)]
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

9 years agoMerge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
Christoph Studer [Wed, 17 Dec 2014 12:16:45 +0000 (12:16 +0000)]
Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs

9 years agoam 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs
Joe Fernandez [Wed, 17 Dec 2014 02:58:28 +0000 (02:58 +0000)]
am 6ff265cc: am df916a89: Merge "docs: studio revision 21 update" into lmp-docs

* commit '6ff265cc882cd7512efcf4736b014ac27e77e5fe':
  docs: studio revision 21 update

9 years agoam f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp...
Joe Fernandez [Wed, 17 Dec 2014 02:58:25 +0000 (02:58 +0000)]
am f9ea93cd: am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs

* commit 'f9ea93cdc9791c71f39caeda71d9abc9a91e89d5':
  docs: studio tools help monkey update

9 years agoam b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs
Joe Fernandez [Wed, 17 Dec 2014 02:58:20 +0000 (02:58 +0000)]
am b8e29d01: am 740436b6: Merge "docs: help-adt link updates" into lmp-docs

* commit 'b8e29d01fb6c7cbadacfd6ada6625dfdc79ec194':
  docs: help-adt link updates

9 years agoam 31d592dc: am cd45de8b: Missing Javadoc update while API review
Sungsoo Lim [Wed, 17 Dec 2014 02:40:50 +0000 (02:40 +0000)]
am 31d592dc: am cd45de8b: Missing Javadoc update while API review

* commit '31d592dc1cd9825c06c55562884be37f523350b3':
  Missing Javadoc update while API review

9 years agoam df916a89: Merge "docs: studio revision 21 update" into lmp-docs
Joe Fernandez [Wed, 17 Dec 2014 02:28:18 +0000 (02:28 +0000)]
am df916a89: Merge "docs: studio revision 21 update" into lmp-docs

* commit 'df916a89feba37f8d16bd61101d43be7d1667bf8':
  docs: studio revision 21 update

9 years agoam 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs
Joe Fernandez [Wed, 17 Dec 2014 02:28:13 +0000 (02:28 +0000)]
am 80287e76: Merge "docs: studio tools help monkey update" into lmp-docs

* commit '80287e768fd40b61dc4e7b8a0394e1f732805dc9':
  docs: studio tools help monkey update

9 years agoMerge "docs: studio revision 21 update" into lmp-docs
Joe Fernandez [Wed, 17 Dec 2014 02:21:47 +0000 (02:21 +0000)]
Merge "docs: studio revision 21 update" into lmp-docs

9 years agoMerge "docs: studio tools help monkey update" into lmp-docs
Joe Fernandez [Wed, 17 Dec 2014 02:20:13 +0000 (02:20 +0000)]
Merge "docs: studio tools help monkey update" into lmp-docs

9 years agoam 740436b6: Merge "docs: help-adt link updates" into lmp-docs
Joe Fernandez [Wed, 17 Dec 2014 01:55:29 +0000 (01:55 +0000)]
am 740436b6: Merge "docs: help-adt link updates" into lmp-docs

* commit '740436b6767aac4c5409b3c9f42ca2606d5ed124':
  docs: help-adt link updates

9 years agoMerge "docs: help-adt link updates" into lmp-docs
Joe Fernandez [Wed, 17 Dec 2014 01:44:20 +0000 (01:44 +0000)]
Merge "docs: help-adt link updates" into lmp-docs

9 years agoam cd45de8b: Missing Javadoc update while API review
Sungsoo Lim [Wed, 17 Dec 2014 01:43:16 +0000 (01:43 +0000)]
am cd45de8b: Missing Javadoc update while API review

* commit 'cd45de8ba336d689500c7a65a6a21611cc73d537':
  Missing Javadoc update while API review

9 years agoMissing Javadoc update while API review
Sungsoo Lim [Fri, 28 Nov 2014 07:21:18 +0000 (16:21 +0900)]
Missing Javadoc update while API review

Bug: 18550989
Change-Id: I766986fd429d58064fca6262a1c650cbcb19bddf
(cherry picked from commit 4e389e557efb7806b73d2059d46e2809c1a9f83d)

9 years agoam 5c3e277f: Fix bad alarm delivery
Christopher Tate [Tue, 16 Dec 2014 21:04:56 +0000 (21:04 +0000)]
am 5c3e277f: Fix bad alarm delivery

* commit '5c3e277fb42bd799287936c5aee0d30fbcc7e65c':
  Fix bad alarm delivery

9 years agoFix bad alarm delivery
Christopher Tate [Tue, 16 Dec 2014 20:14:06 +0000 (12:14 -0800)]
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

9 years agoam aaa37da8: am a158abe4: Merge "docs: Updates lesson 1 of location API training...
Sarah Maddox [Mon, 15 Dec 2014 21:57:02 +0000 (21:57 +0000)]
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.

9 years agoam a158abe4: Merge "docs: Updates lesson 1 of location API training: Get last-known...
Sarah Maddox [Mon, 15 Dec 2014 21:50:27 +0000 (21:50 +0000)]
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.

9 years agoMerge "docs: Updates lesson 1 of location API training: Get last-known location....
Sarah Maddox [Mon, 15 Dec 2014 20:42:36 +0000 (20:42 +0000)]
Merge "docs: Updates lesson 1 of location API training: Get last-known location." into lmp-docs

9 years agodocs: studio revision 21 update
Rich Slogar [Mon, 15 Dec 2014 18:46:18 +0000 (10:46 -0800)]
docs: studio revision 21 update

Change-Id: I61a6fa657aae08760a73816d5ad5536957a3be20

9 years agoam 16d9a037: am 68e6819b: brute force improve suggestions for sdk download
smain@google.com [Mon, 15 Dec 2014 18:19:05 +0000 (18:19 +0000)]
am 16d9a037: am 68e6819b: brute force improve suggestions for sdk download

* commit '16d9a0378fb1c8fbefb263df2e3d627202ae677d':
  brute force improve suggestions for sdk download

9 years agoam 68e6819b: brute force improve suggestions for sdk download
smain@google.com [Mon, 15 Dec 2014 18:10:45 +0000 (18:10 +0000)]
am 68e6819b: brute force improve suggestions for sdk download

* commit '68e6819bd023d24894fc7cbb2357c685177d9b84':
  brute force improve suggestions for sdk download

9 years agobrute force improve suggestions for sdk download
smain@google.com [Mon, 15 Dec 2014 18:00:59 +0000 (10:00 -0800)]
brute force improve suggestions for sdk download

Change-Id: I4698058a12472a65e67cadc3d0e3dd1ffed1b384

9 years agodocs: Updates lesson 1 of location API training: Get last-known location.
Sarah Maddox [Tue, 28 Oct 2014 05:30:24 +0000 (16:30 +1100)]
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

9 years agoam 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update
Rich Slogar [Sat, 13 Dec 2014 06:24:20 +0000 (06:24 +0000)]
am 895d1694: am 6b8756c3: docs: studio 1.0.1 revision update

* commit '895d16945e97e108e33c614f87004c3f1efe5cb4':
  docs: studio 1.0.1 revision update

9 years agoam 6b8756c3: docs: studio 1.0.1 revision update
Rich Slogar [Sat, 13 Dec 2014 06:17:00 +0000 (06:17 +0000)]
am 6b8756c3: docs: studio 1.0.1 revision update

* commit '6b8756c39764b166c9f7d384e4542960dd8a7f98':
  docs: studio 1.0.1 revision update

9 years agodocs: studio 1.0.1 revision update
Rich Slogar [Fri, 12 Dec 2014 22:59:34 +0000 (14:59 -0800)]
docs: studio 1.0.1 revision update

Change-Id: If9ef9ba986ae02463bec8040924a06ab0ccc8124

9 years agoam 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted...
smain@google.com [Sat, 13 Dec 2014 01:12:37 +0000 (01:12 +0000)]
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.

9 years agoam 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly...
smain@google.com [Sat, 13 Dec 2014 01:04:02 +0000 (01:04 +0000)]
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.

9 years agoMerge "fix distribute nav styles. they were not highlighted correctly." into lmp...
smain@google.com [Sat, 13 Dec 2014 00:55:30 +0000 (00:55 +0000)]
Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs

9 years agoam 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs
Joe Fernandez [Sat, 13 Dec 2014 00:34:20 +0000 (00:34 +0000)]
am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs

* commit '4234fca655819538fea60cafe2b8bf3e597fa3ea':
  docs: uiautomator blog link removal

9 years agoam 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs
Joe Fernandez [Sat, 13 Dec 2014 00:25:14 +0000 (00:25 +0000)]
am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs

* commit '044f3947bc2e5e1beb2e46dd8e32822b57132b4a':
  docs: uiautomator blog link removal

9 years agoMerge "docs: uiautomator blog link removal" into lmp-docs
Joe Fernandez [Sat, 13 Dec 2014 00:20:28 +0000 (00:20 +0000)]
Merge "docs: uiautomator blog link removal" into lmp-docs

9 years agoam e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs
Joe Fernandez [Sat, 13 Dec 2014 00:16:56 +0000 (00:16 +0000)]
am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs

* commit 'e70cb874d9a53c6afa78c752ababe8e2f44ba0c8':
  docs: studio basics typo

9 years agoam 47efca78: am a854ddfd: docs: Add two new general functionality requirements
Luan Nguyen [Sat, 13 Dec 2014 00:12:16 +0000 (00:12 +0000)]
am 47efca78: am a854ddfd: docs: Add two new general functionality requirements

* commit '47efca783cda4a9f13d172ddfc30443de1d94b91':
  docs: Add two new general functionality requirements

9 years agoam c59d1d78: Merge "docs: studio basics typo" into lmp-docs
Joe Fernandez [Sat, 13 Dec 2014 00:10:17 +0000 (00:10 +0000)]
am c59d1d78: Merge "docs: studio basics typo" into lmp-docs

* commit 'c59d1d780b03b96b3d92990d629de865dd2c585c':
  docs: studio basics typo

9 years agoam a854ddfd: docs: Add two new general functionality requirements
Luan Nguyen [Sat, 13 Dec 2014 00:04:06 +0000 (00:04 +0000)]
am a854ddfd: docs: Add two new general functionality requirements

* commit 'a854ddfd79c7d1458452b6238fbc5f69ba610002':
  docs: Add two new general functionality requirements

9 years agoMerge "docs: studio basics typo" into lmp-docs
Joe Fernandez [Sat, 13 Dec 2014 00:03:08 +0000 (00:03 +0000)]
Merge "docs: studio basics typo" into lmp-docs

9 years agodocs: studio basics typo
Rich Slogar [Fri, 12 Dec 2014 00:25:17 +0000 (16:25 -0800)]
docs: studio basics typo

Change-Id: I3e20deb2abc8513266cc2182d9be1ae809bbeae0

9 years agodocs: Add two new general functionality requirements
Luan Nguyen [Fri, 12 Dec 2014 20:15:21 +0000 (12:15 -0800)]
docs: Add two new general functionality requirements

Bug: 18733124
Change-Id: Ia4b1e74980cbb645d1ab0b61ec56f06a3704fd3b

9 years agoIf no display settings are matched, return the first one. DO NOT MERGE
Mark Renouf [Thu, 30 Oct 2014 20:57:30 +0000 (16:57 -0400)]
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)

9 years agoFix MediaStyle docs mentioning 2 max actions in compact view
Christoph Studer [Fri, 12 Dec 2014 12:23:26 +0000 (13:23 +0100)]
Fix MediaStyle docs mentioning 2 max actions in compact view

Bug: 18729304
Change-Id: Ica6b8ac47d7d38b1de62d64830256f66cbbdb225

9 years agodocs: help-adt link updates
Rich Slogar [Thu, 11 Dec 2014 00:49:15 +0000 (16:49 -0800)]
docs: help-adt link updates

Change-Id: I60fdea090d330a90ebf12b954fa312dbd49cec29

9 years agoMerge "Tune delivery and batching of alarms" into lmp-dev
Bart Sears [Fri, 12 Dec 2014 13:15:38 +0000 (13:15 +0000)]
Merge "Tune delivery and batching of alarms" into lmp-dev
automerge: 3ec6a91

* commit '3ec6a91204ffac6e81eaad7ca29e817e9502f856':
  Tune delivery and batching of alarms

9 years agoProperly recognize repeating wakeup alarms
Christopher Tate [Fri, 12 Dec 2014 13:14:30 +0000 (13:14 +0000)]
Properly recognize repeating wakeup alarms
automerge: 8965a8d

* commit '8965a8da5513cf31a313ecdac3506718c2813932':
  Properly recognize repeating wakeup alarms

9 years agoMerge "Tune delivery and batching of alarms" into lmp-dev
Bart Sears [Fri, 12 Dec 2014 01:52:29 +0000 (01:52 +0000)]
Merge "Tune delivery and batching of alarms" into lmp-dev

9 years agodocs: uiautomator blog link removal
Rich Slogar [Fri, 12 Dec 2014 00:17:36 +0000 (16:17 -0800)]
docs: uiautomator blog link removal

Change-Id: I4e5afc42798c4f313d6bdefd5e884fd39c48f469

9 years agoTune delivery and batching of alarms
Christopher Tate [Fri, 5 Dec 2014 02:27:16 +0000 (18:27 -0800)]
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)

9 years agoProperly recognize repeating wakeup alarms
Christopher Tate [Tue, 2 Dec 2014 19:48:53 +0000 (11:48 -0800)]
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 864d42eb96a9127b7d2f10ad11e709c24b4b4304)

9 years agodocs: studio tools help monkey update
Rich Slogar [Thu, 11 Dec 2014 23:09:42 +0000 (15:09 -0800)]
docs: studio tools help monkey update

Change-Id: Ib916e60dbf6caffc97ac4414f661276339d86888

9 years agoam c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs
David Friedman [Thu, 11 Dec 2014 22:10:48 +0000 (22:10 +0000)]
am c82392df: am 1ab615b3: Merge "Adds link to related video." into lmp-docs

* commit 'c82392df7caa12836d97650c7528f216d3c2b76f':
  Adds link to related video.

9 years agoam 1ab615b3: Merge "Adds link to related video." into lmp-docs
David Friedman [Thu, 11 Dec 2014 22:03:42 +0000 (22:03 +0000)]
am 1ab615b3: Merge "Adds link to related video." into lmp-docs

* commit '1ab615b3e6a7ae820fde4ba067f76dff635f3639':
  Adds link to related video.

9 years agoMerge "Adds link to related video." into lmp-docs
David Friedman [Thu, 11 Dec 2014 21:55:23 +0000 (21:55 +0000)]
Merge "Adds link to related video." into lmp-docs

9 years agoam ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
Joe Fernandez [Thu, 11 Dec 2014 19:59:00 +0000 (19:59 +0000)]
am ea500a3a: am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs

* commit 'ea500a3adf6bcf17ad22f05acd8c3220358f72ce':
  docs: studio basics haxm updates

9 years agoam 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
Joe Fernandez [Thu, 11 Dec 2014 19:50:39 +0000 (19:50 +0000)]
am 0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs

* commit '0aa234457737cdb31538711251920aef3a70bb56':
  docs: studio basics haxm updates

9 years agoam 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
Ricardo Cervera [Thu, 11 Dec 2014 19:43:25 +0000 (19:43 +0000)]
am 6621a4f6: am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs

* commit '6621a4f6f9c63ff952c5e64a5ae1e41ef5ac5960':
  docs: Fixes to watch faces docs.

9 years agoMerge "docs: studio basics haxm updates" into lmp-docs
Joe Fernandez [Thu, 11 Dec 2014 19:43:17 +0000 (19:43 +0000)]
Merge "docs: studio basics haxm updates" into lmp-docs

9 years agoam 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
Ricardo Cervera [Thu, 11 Dec 2014 19:35:41 +0000 (19:35 +0000)]
am 9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs

* commit '9fe34d9037dc27abb89c64ff75b87fdf9a4eaa8b':
  docs: Fixes to watch faces docs.

9 years agoMerge "docs: Fixes to watch faces docs." into lmp-docs
Ricardo Cervera [Thu, 11 Dec 2014 19:28:39 +0000 (19:28 +0000)]
Merge "docs: Fixes to watch faces docs." into lmp-docs

9 years agoam 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs
Rich Slogar [Thu, 11 Dec 2014 19:17:05 +0000 (19:17 +0000)]
am 5c853c26: am d35216ad: Merge "docs: studio bundle update" into lmp-docs

* commit '5c853c26a879c411a98e1530247a41a856f7784c':
  docs: studio bundle update

9 years agoam d35216ad: Merge "docs: studio bundle update" into lmp-docs
Rich Slogar [Thu, 11 Dec 2014 19:09:39 +0000 (19:09 +0000)]
am d35216ad: Merge "docs: studio bundle update" into lmp-docs

* commit 'd35216ad36aefb121167ad781b25f7a37d5c1e52':
  docs: studio bundle update

9 years agoMerge "docs: studio bundle update" into lmp-docs
Rich Slogar [Thu, 11 Dec 2014 19:04:01 +0000 (19:04 +0000)]
Merge "docs: studio bundle update" into lmp-docs

9 years agodocs: studio bundle update
Rich Slogar [Thu, 11 Dec 2014 18:43:11 +0000 (10:43 -0800)]
docs: studio bundle update

Change-Id: I232a61ae6747b879e8a36f8e4942d6a3406c4162

9 years agodocs: studio basics haxm updates
Rich Slogar [Thu, 11 Dec 2014 18:03:19 +0000 (10:03 -0800)]
docs: studio basics haxm updates

Change-Id: I2c3ef0dae3a091be27f1cfef13fe385f97781492

9 years agodocs: Fixes to watch faces docs.
Ricardo Cervera [Wed, 10 Dec 2014 21:05:17 +0000 (13:05 -0800)]
docs: Fixes to watch faces docs.

Bug: 18705470
Bug: 18702859
Bug: 18713266

Change-Id: I67f159f3b54a03f08aa1cd4bf3aa40eec4a34631

9 years agoam b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
Joe Fernandez [Thu, 11 Dec 2014 00:45:20 +0000 (00:45 +0000)]
am b32987ec: am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs

* commit 'b32987ec2f8fbe887be4a6f4ed9a17f8e0a8cf22':
  docs: platform updates for api 21

9 years agoam 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
Joe Fernandez [Thu, 11 Dec 2014 00:37:10 +0000 (00:37 +0000)]
am 378c71a3: am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs

* commit '378c71a39187c333fd1be83a1b1d77e195ccdd2a':
  docs: sdk tools 24.0.1 revisions

9 years agoam f43c057c: am c7ad6e91: docs: Added info about managed profiles to "Android 5.0...
Andrew Solovay [Thu, 11 Dec 2014 00:37:06 +0000 (00:37 +0000)]
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"

9 years agoam c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
Joe Fernandez [Thu, 11 Dec 2014 00:36:53 +0000 (00:36 +0000)]
am c3daed96: Merge "docs: platform updates for api 21" into lmp-docs

* commit 'c3daed967d5ad6b4df8547679c30c4d2efd005b3':
  docs: platform updates for api 21

9 years agoMerge "docs: platform updates for api 21" into lmp-docs
Joe Fernandez [Thu, 11 Dec 2014 00:31:52 +0000 (00:31 +0000)]
Merge "docs: platform updates for api 21" into lmp-docs

9 years agoam 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
Joe Fernandez [Thu, 11 Dec 2014 00:29:19 +0000 (00:29 +0000)]
am 235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs

* commit '235e4be4c92fbc68544f15bebcc6a92ab5d21183':
  docs: sdk tools 24.0.1 revisions

9 years agoam c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
Andrew Solovay [Thu, 11 Dec 2014 00:29:14 +0000 (00:29 +0000)]
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"

9 years agoMerge "docs: sdk tools 24.0.1 revisions" into lmp-docs
Joe Fernandez [Thu, 11 Dec 2014 00:27:00 +0000 (00:27 +0000)]
Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs

9 years agodocs: Added info about managed profiles to "Android 5.0 Changes"
Andrew Solovay [Tue, 9 Dec 2014 22:46:54 +0000 (14:46 -0800)]
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

9 years agoam c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs
smain@google.com [Wed, 10 Dec 2014 23:49:17 +0000 (23:49 +0000)]
am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs

* commit 'c0f96532caa62f477af33a271b546a7d0c932c36':
  add helpouts widget to wave 3 pages

9 years agoam 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs
smain@google.com [Wed, 10 Dec 2014 23:37:52 +0000 (23:37 +0000)]
am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs

* commit '8cd0bb2df377b2452d5b12ac5057143da4ecb899':
  add helpouts widget to wave 3 pages

9 years agoMerge "add helpouts widget to wave 3 pages" into lmp-docs
smain@google.com [Wed, 10 Dec 2014 23:07:36 +0000 (23:07 +0000)]
Merge "add helpouts widget to wave 3 pages" into lmp-docs

9 years agoam 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index.
Luan Nguyen [Wed, 10 Dec 2014 22:12:20 +0000 (22:12 +0000)]
am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index.

* commit '7e1b348ac55d4368172809031808a39576d00eea':
  docs: Fix link for moved Android Studio index.

9 years agoam 4221d7e4: docs: Fix link for moved Android Studio index.
Luan Nguyen [Wed, 10 Dec 2014 22:04:20 +0000 (22:04 +0000)]
am 4221d7e4: docs: Fix link for moved Android Studio index.

* commit '4221d7e4cbcea9ea6be56322c7839f31b2afb828':
  docs: Fix link for moved Android Studio index.

9 years agodocs: Fix link for moved Android Studio index.
Luan Nguyen [Wed, 10 Dec 2014 21:42:05 +0000 (13:42 -0800)]
docs: Fix link for moved Android Studio index.

Change-Id: Ia0c4cdcf05fddd12e0e50c2b6343809f80ab5f65

9 years agofix distribute nav styles. they were not highlighted correctly.
smain@google.com [Wed, 10 Dec 2014 20:40:49 +0000 (12:40 -0800)]
fix distribute nav styles. they were not highlighted correctly.

Change-Id: I53f727353d263eb8caa62261751be3adcdc18273

9 years agoam bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into...
Joe Fernandez [Wed, 10 Dec 2014 19:47:11 +0000 (19:47 +0000)]
am bdd6aabd: am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs

* commit 'bdd6aabd1fd98762b22bb347d24c99e2c388d166':
  docs: update debug menu for debugging-studio

9 years agoam d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs
Joe Fernandez [Wed, 10 Dec 2014 19:38:28 +0000 (19:38 +0000)]
am d49977d9: Merge "docs: update debug menu for debugging-studio" into lmp-docs

* commit 'd49977d967d7db24466abba9a97084a955f56aff':
  docs: update debug menu for debugging-studio

9 years agoam 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs
Joe Fernandez [Wed, 10 Dec 2014 19:38:17 +0000 (19:38 +0000)]
am 534ae165: am 3454091d: Merge "docs:studio basic links" into lmp-docs

* commit '534ae165f374d81335dc1b7742df1168c8d5ae36':
  docs:studio basic links

9 years agoMerge "docs: update debug menu for debugging-studio" into lmp-docs
Joe Fernandez [Wed, 10 Dec 2014 19:31:10 +0000 (19:31 +0000)]
Merge "docs: update debug menu for debugging-studio" into lmp-docs

9 years agoam 3454091d: Merge "docs:studio basic links" into lmp-docs
Joe Fernandez [Wed, 10 Dec 2014 19:30:37 +0000 (19:30 +0000)]
am 3454091d: Merge "docs:studio basic links" into lmp-docs

* commit '3454091dad65256730b714d8ce0f89c137c1c0c2':
  docs:studio basic links

9 years agodocs: sdk tools 24.0.1 revisions
Rich Slogar [Wed, 10 Dec 2014 19:27:59 +0000 (11:27 -0800)]
docs: sdk tools 24.0.1 revisions

Change-Id: I872aaba5844fe7642874147b158c8119d111162d

9 years agoMerge "docs:studio basic links" into lmp-docs
Joe Fernandez [Wed, 10 Dec 2014 19:23:15 +0000 (19:23 +0000)]
Merge "docs:studio basic links" into lmp-docs

9 years agoam 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps
Luan Nguyen [Wed, 10 Dec 2014 19:19:05 +0000 (19:19 +0000)]
am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps

* commit '8a65df39e6ad2fc357c8a327626f40588ce00553':
  docs: Fix text on step 5 of the opt-in steps

9 years agodocs: update debug menu for debugging-studio
Rich Slogar [Tue, 9 Dec 2014 01:25:48 +0000 (17:25 -0800)]
docs: update debug menu for debugging-studio

Change-Id: I04c71104b1ac9c0e4413c518ccd41ba3e6a90f8f

9 years agoAdds link to related video.
David Friedman [Wed, 10 Dec 2014 19:14:01 +0000 (11:14 -0800)]
Adds link to related video.

Change-Id: I22823b0df2863c4e733d389d20440debb16c5631

9 years agoam 258da738: docs: Fix text on step 5 of the opt-in steps
Luan Nguyen [Wed, 10 Dec 2014 19:10:41 +0000 (19:10 +0000)]
am 258da738: docs: Fix text on step 5 of the opt-in steps

* commit '258da738463f547eab859c21d32cbfe0f8345ae2':
  docs: Fix text on step 5 of the opt-in steps

9 years agodocs: Fix text on step 5 of the opt-in steps
Luan Nguyen [Wed, 10 Dec 2014 18:37:43 +0000 (10:37 -0800)]
docs: Fix text on step 5 of the opt-in steps

Bug: 18702823
Change-Id: I294eb017592e896217d7eeea024aa32b9f4f1511

9 years agoadd helpouts widget to wave 3 pages
smain@google.com [Wed, 10 Dec 2014 18:21:36 +0000 (10:21 -0800)]
add helpouts widget to wave 3 pages

Change-Id: I83c1a0af4975a4544a7f7dcb745bf5fbdf173c6e

9 years agodocs:studio basic links
Rich Slogar [Wed, 10 Dec 2014 18:04:26 +0000 (10:04 -0800)]
docs:studio basic links

Change-Id: Ib097530baa3035bc83eeb49a3e14eadbac58aca1

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Dec 2014 17:13:28 +0000 (09:13 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5bd1364488d92127594b2f8d6d39ae9b18495be1
Auto-generated-cl: translation import

9 years agoam 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps.
Ricardo Cervera [Wed, 10 Dec 2014 05:49:52 +0000 (05:49 +0000)]
am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps.

* commit '933005e9e2912a5695ae8b1eeadcb77b05309d2d':
  docs: Add details to Packaging Wearable apps.

9 years agoam dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement descri...
Joe Fernandez [Wed, 10 Dec 2014 05:49:49 +0000 (05:49 +0000)]
am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs

* commit 'dfd05f0a867a4c5f6d940aa41a11c034fb7934ab':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.