OSDN Git Service

android-x86/frameworks-base.git
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 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 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 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.

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

* commit '900efcc91c980a0b30fc1d3017e33e30198b8eb8':
  docs: Add details to Packaging Wearable apps.

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

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

9 years agoam ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class...
Ricardo Cervera [Wed, 10 Dec 2014 05:39:40 +0000 (05:39 +0000)]
am ea15366a: am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs

* commit 'ea15366ae304844756ebdd3d0464b8f9f8d9ce9f':
  docs: Creating Custom Watch Faces training class.

9 years agoam c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev
Ricardo Cervera [Wed, 10 Dec 2014 05:39:36 +0000 (05:39 +0000)]
am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev

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

9 years agodocs: Add details to Packaging Wearable apps.
Ricardo Cervera [Tue, 21 Oct 2014 20:04:05 +0000 (13:04 -0700)]
docs: Add details to Packaging Wearable apps.

Bug: 17943949

(cherry picked from commit 07c9c63e3dd7ee6c752abed3ba54faa949184ca8)

Change-Id: I765285b7e1a17928778ac161c73b2e48b82b54d6

9 years agoMerge "docs: Update wording on Packaging requirement description. Add Watch Face...
Joe Fernandez [Wed, 10 Dec 2014 05:35:20 +0000 (05:35 +0000)]
Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs

9 years agoam 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs
Ricardo Cervera [Wed, 10 Dec 2014 05:34:39 +0000 (05:34 +0000)]
am 26e21055: Merge "docs: Creating Custom Watch Faces training class." into lmp-docs

* commit '26e2105575939918e362f14b854176bc54e39b44':
  docs: Creating Custom Watch Faces training class.

9 years agoMerge "docs: Add details to Packaging Wearable apps." into lmp-dev
Ricardo Cervera [Wed, 10 Dec 2014 05:32:17 +0000 (05:32 +0000)]
Merge "docs: Add details to Packaging Wearable apps." into lmp-dev

9 years agoMerge "docs: Creating Custom Watch Faces training class." into lmp-docs
Ricardo Cervera [Wed, 10 Dec 2014 05:28:32 +0000 (05:28 +0000)]
Merge "docs: Creating Custom Watch Faces training class." into lmp-docs

9 years agoam ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft."...
Ricardo Cervera [Wed, 10 Dec 2014 05:28:04 +0000 (05:28 +0000)]
am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs

* commit 'ec656c51eec62b8b6a8599675add07762f0587cd':
  docs: Design guidelines for watch faces draft.

9 years agodocs: Creating Custom Watch Faces training class.
Ricardo Cervera [Fri, 21 Nov 2014 19:47:40 +0000 (11:47 -0800)]
docs: Creating Custom Watch Faces training class.

Bug: 18338418
Bug: 18533881

Change-Id: I71d38c73b6a76c9bec8b646967a93d60b05c639b

9 years agoam 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs
Ricardo Cervera [Wed, 10 Dec 2014 05:21:30 +0000 (05:21 +0000)]
am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs

* commit '0024f12dec948d25738c28175ac26d9829b6cd7b':
  docs: Design guidelines for watch faces draft.

9 years agoMerge "docs: Design guidelines for watch faces draft." into lmp-docs
Ricardo Cervera [Wed, 10 Dec 2014 05:12:48 +0000 (05:12 +0000)]
Merge "docs: Design guidelines for watch faces draft." into lmp-docs

9 years agoam 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify...
smain@google.com [Wed, 10 Dec 2014 03:43:07 +0000 (03:43 +0000)]
am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs

* commit '6554bb45eab54061e72f3f3414e40cf4f8e62097':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.

9 years agoam c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into...
Joe Fernandez [Wed, 10 Dec 2014 03:38:05 +0000 (03:38 +0000)]
am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs

* commit 'c3ae259639d79bfec2d6e50d5fff6b2ced353549':
  docs: Add Distributing to Android Wear doc

9 years agoam eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into...
Ricardo Cervera [Wed, 10 Dec 2014 03:38:01 +0000 (03:38 +0000)]
am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs

* commit 'eb09f89896b589059718d7e8f1b94ed8e2969927':
  docs: Add new classes to Wearable UI library

9 years agoam be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT...
Ricardo Cervera [Wed, 10 Dec 2014 03:37:58 +0000 (03:37 +0000)]
am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs

* commit 'be80b984690ca3a6c54a8bab1d0bd8f15386c5a2':
  docs: Add links to wearable support zip for ADT

9 years agoam c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to...
Quddus Chong [Wed, 10 Dec 2014 03:37:53 +0000 (03:37 +0000)]
am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs

* commit 'c24c579770d9663174204e4e9413060bcb8e4a58':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.

9 years agoam 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles...
smain@google.com [Wed, 10 Dec 2014 03:32:44 +0000 (03:32 +0000)]
am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs

* commit '1a2308bb8575602689b02379cb96da008f403b5a':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.

9 years agoMerge "misc updates related to Android Studio. clarify a few doc titles for improved...
smain@google.com [Wed, 10 Dec 2014 03:28:23 +0000 (03:28 +0000)]
Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." into lmp-docs

9 years agoam 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs
Joe Fernandez [Wed, 10 Dec 2014 03:23:06 +0000 (03:23 +0000)]
am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs

* commit '1e82428495ae0c909a7c67dd2f7879ee1e603245':
  docs: Add Distributing to Android Wear doc

9 years agoam d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs
Ricardo Cervera [Wed, 10 Dec 2014 03:23:03 +0000 (03:23 +0000)]
am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs

* commit 'd412b9ab7435ea03392ef3e710a20c0b69056141':
  docs: Add new classes to Wearable UI library

9 years agoam 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs
Ricardo Cervera [Wed, 10 Dec 2014 03:22:59 +0000 (03:22 +0000)]
am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs

* commit '0d8f1417209ba0a38a97ae8e31b4ae87e0f1e7c2':
  docs: Add links to wearable support zip for ADT

9 years agoam 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal...
Quddus Chong [Wed, 10 Dec 2014 03:22:54 +0000 (03:22 +0000)]
am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs

* commit '09e72628fc9e58659c18b1bbbb1a0ec8a5878221':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.

9 years agoMerge "docs: Add Distributing to Android Wear doc" into lmp-docs
Joe Fernandez [Wed, 10 Dec 2014 02:10:05 +0000 (02:10 +0000)]
Merge "docs: Add Distributing to Android Wear doc" into lmp-docs

9 years agomisc updates related to Android Studio.
smain@google.com [Wed, 10 Dec 2014 00:39:47 +0000 (16:39 -0800)]
misc updates related to Android Studio.
clarify a few doc titles for improved search results clarity.
update "get started" page link to Android Studio, add First App link,
and remove some biased language.

Change-Id: I5e4faef8a6eb0a08eec45981a4f9436cb07a995c

9 years agoMerge "docs: Add new classes to Wearable UI library" into lmp-docs
Ricardo Cervera [Wed, 10 Dec 2014 00:56:49 +0000 (00:56 +0000)]
Merge "docs: Add new classes to Wearable UI library" into lmp-docs

9 years agoMerge "docs: Add links to wearable support zip for ADT" into lmp-docs
Ricardo Cervera [Wed, 10 Dec 2014 00:56:13 +0000 (00:56 +0000)]
Merge "docs: Add links to wearable support zip for ADT" into lmp-docs

9 years agoMerge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationCl...
Quddus Chong [Wed, 10 Dec 2014 00:02:16 +0000 (00:02 +0000)]
Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs

9 years agodocs: platform updates for api 21
Rich Slogar [Tue, 9 Dec 2014 21:20:45 +0000 (13:20 -0800)]
docs: platform updates for api 21

Change-Id: I6dd1897641243a19ece0acfd16866cb0d7c3a24a

9 years agodocs: Add Distributing to Android Wear doc
Luan Nguyen [Thu, 4 Dec 2014 22:32:30 +0000 (14:32 -0800)]
docs: Add Distributing to Android Wear doc

Change-Id: I123f53b4d7a1098c1caabc88a1e6fd6dd828d3fb

9 years agoam 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into...
Joe Fernandez [Tue, 9 Dec 2014 23:12:53 +0000 (23:12 +0000)]
am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs

* commit '6d4818529e435b2e6d285233bd0668e3ba25f6c9':
  :docs studio tips and tricks headings updates

9 years agoam b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs
Joe Fernandez [Tue, 9 Dec 2014 23:04:13 +0000 (23:04 +0000)]
am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs

* commit 'b35a509d0eb4d9c150630fc6108f4bc039a09043':
  :docs studio tips and tricks headings updates

9 years agoMerge ":docs studio tips and tricks headings updates" into lmp-docs
Joe Fernandez [Tue, 9 Dec 2014 22:56:36 +0000 (22:56 +0000)]
Merge ":docs studio tips and tricks headings updates" into lmp-docs

9 years agodocs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient...
Quddus Chong [Tue, 9 Dec 2014 21:09:06 +0000 (13:09 -0800)]
docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.

Change-Id: I240feafe4002884dbb2495ffefc599a76b6b7a35

9 years agoam 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into...
Ricardo Cervera [Tue, 9 Dec 2014 22:40:55 +0000 (22:40 +0000)]
am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs

* commit '47fa63553bc53d46bc5e1b8873ff81a774d399e7':
  docs: Adding links to material design videos

9 years ago:docs studio tips and tricks headings updates
Rich Slogar [Tue, 9 Dec 2014 22:23:18 +0000 (14:23 -0800)]
:docs studio tips and tricks headings updates

Change-Id: I5453263b575610b6f418569bdf79f73a693c641b

9 years agoam 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs
Ricardo Cervera [Tue, 9 Dec 2014 22:16:58 +0000 (22:16 +0000)]
am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs

* commit '5155840ba091f62ea3079328b25a620089223887':
  docs: Adding links to material design videos

9 years agoMerge "docs: Adding links to material design videos" into lmp-docs
Ricardo Cervera [Tue, 9 Dec 2014 21:16:39 +0000 (21:16 +0000)]
Merge "docs: Adding links to material design videos" into lmp-docs

9 years agoam 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs
Elliott Hughes [Tue, 9 Dec 2014 19:30:26 +0000 (19:30 +0000)]
am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs

* commit '12f100def9e34a554df07f47badc259028ac4c68':
  Fix typo.

9 years agoam e8f6cb06: Merge "Fix typo." into lmp-docs
Elliott Hughes [Tue, 9 Dec 2014 19:22:33 +0000 (19:22 +0000)]
am e8f6cb06: Merge "Fix typo." into lmp-docs

* commit 'e8f6cb065c33c21dfefe0039739dc38fde5cff6d':
  Fix typo.

9 years agoMerge "Fix typo." into lmp-docs
Elliott Hughes [Tue, 9 Dec 2014 19:16:16 +0000 (19:16 +0000)]
Merge "Fix typo." into lmp-docs

9 years agoam 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken...
smain@google.com [Tue, 9 Dec 2014 19:04:30 +0000 (19:04 +0000)]
am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link

* commit '780a2231ff23d85e56a7a7ddd4a4768d85d6a0c9':
  revise ADT migration message b/18668828 and fix broken link

9 years agoam 2023bec7: revise ADT migration message b/18668828 and fix broken link
smain@google.com [Tue, 9 Dec 2014 18:56:20 +0000 (18:56 +0000)]
am 2023bec7: revise ADT migration message b/18668828 and fix broken link

* commit '2023bec7bfed3175819abbe59ebc974872c7981c':
  revise ADT migration message b/18668828 and fix broken link

9 years agodocs: Add new classes to Wearable UI library
Ricardo Cervera [Tue, 9 Dec 2014 18:48:23 +0000 (10:48 -0800)]
docs: Add new classes to Wearable UI library

Bug: 18488927

Change-Id: If91993a456bd939f6c51f60500cf325f5eca1d29

9 years agodocs: Adding links to material design videos
Ricardo Cervera [Tue, 9 Dec 2014 18:33:02 +0000 (10:33 -0800)]
docs: Adding links to material design videos

Change-Id: I07d849f9338a35179b0bb967e8ea3dd29736730a

9 years agoFix typo.
Elliott Hughes [Tue, 9 Dec 2014 04:47:11 +0000 (20:47 -0800)]
Fix typo.

Bug: https://code.google.com/p/android/issues/detail?id=78422

(cherry picked from commit 0adcf15ad8b41559b50b3cbde6a103582f8c95b8)

Change-Id: I62746a0690e9845b20b23b91f2a50d85214e8aa1

9 years agodocs: Design guidelines for watch faces draft.
Ricardo Cervera [Wed, 19 Nov 2014 21:10:15 +0000 (13:10 -0800)]
docs: Design guidelines for watch faces draft.

Bug: 18338418

Change-Id: Ibf699ee48b7d4ac2800a435e4d95c2b15278861f

9 years agodocs: Add links to wearable support zip for ADT
Ricardo Cervera [Thu, 4 Dec 2014 22:55:16 +0000 (14:55 -0800)]
docs: Add links to wearable support zip for ADT

Bug: 16651409
Bug: 18488729

Change-Id: I088fc86a469703f81fdc1e6b36395bcee8ecbf28

9 years agorevise ADT migration message
smain@google.com [Tue, 9 Dec 2014 03:18:27 +0000 (19:18 -0800)]
revise ADT migration message
b/18668828
and fix broken link

Change-Id: I64cba60ebdd0649a0394e0f4284160514f56099e

9 years agoam fe4b4009: am a111eb84: Merge "clarify release notes pages with more specific title...
smain@google.com [Tue, 9 Dec 2014 03:05:03 +0000 (03:05 +0000)]
am fe4b4009: am a111eb84: Merge "clarify release notes pages with more specific titles and new links to related docs." into lmp-docs

* commit 'fe4b4009dab1b8de1c1eca6ee0f39f3b0786f45b':
  clarify release notes pages with more specific titles and new links to related docs.