OSDN Git Service
Sharvil Nanavati [Tue, 23 Jun 2015 21:07:26 +0000 (14:07 -0700)]
resolved conflicts for merge of
7c250056 to lmp-mr1-ub-dev
Change-Id: I8ec2e76756e61a6e6bbe85ca699facbde1c1fbc7
Dirk Dougherty [Mon, 22 Jun 2015 22:26:59 +0000 (22:26 +0000)]
am
813d974e: Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.
* commit '
813d974e33366aaeeb54e242e2767d4eeaf940dc':
Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.
Dirk Dougherty [Mon, 22 Jun 2015 21:12:03 +0000 (14:12 -0700)]
Doc change: Explicitly state the initial API level that supports maxSdkVersion attr in uses-permission.
Change-Id: Ifb20f84560dc1c8655b8d216038a2b56777df460
Dirk Dougherty [Mon, 22 Jun 2015 20:35:02 +0000 (20:35 +0000)]
am
19332345: Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.
* commit '
19332345516292c29bf1a52e896f7aba9bb30af6':
Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.
Sharvil Nanavati [Sat, 20 Jun 2015 19:05:52 +0000 (12:05 -0700)]
Dump bonded Bluetooth devices in dumpsys.
Change-Id: Ie509b0abc64cbc7813e9fe844ff4c05d8cb05f9d
Dirk Dougherty [Sat, 13 Jun 2015 02:41:35 +0000 (19:41 -0700)]
Doc change: update main landing and distribute carousel items. Fix typo in Google Play card.
Change-Id: I94b8cfbf5d0afab3d6e6db658a2e73817de9967c
Quddus Chong [Fri, 19 Jun 2015 23:49:15 +0000 (23:49 +0000)]
am
4437a129: Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976" into mnc-preview-docs
* commit '
4437a1294e26507449b48783a31b422d769af53b':
docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976
Quddus Chong [Fri, 19 Jun 2015 23:49:11 +0000 (23:49 +0000)]
am
cdc28652: Merge "docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002" into mnc-preview-docs
* commit '
cdc28652601d977bd0964d088b9070f6d2ef32d9':
docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002
Quddus Chong [Fri, 19 Jun 2015 23:37:39 +0000 (23:37 +0000)]
Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976" into mnc-preview-docs
Quddus Chong [Fri, 19 Jun 2015 23:37:10 +0000 (23:37 +0000)]
Merge "docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002" into mnc-preview-docs
Filip Gruszczynski [Fri, 19 Jun 2015 23:28:10 +0000 (23:28 +0000)]
am
dd91362c: Make sure home activity gets resumed after started.
* commit '
dd91362c2c65dbcd781034a16f293d5489946f3e':
Make sure home activity gets resumed after started.
David Friedman [Fri, 19 Jun 2015 23:01:02 +0000 (23:01 +0000)]
am
bee8d60a: Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
* commit '
bee8d60a1cdfb380904f8770d933e9031c7f9ff3':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
David Friedman [Thu, 18 Sep 2014 01:04:23 +0000 (18:04 -0700)]
Fixes a typo where parens were used instead of curly braces, preventing
a link from being created at build time.
Change-Id: I4086ce5054cc2d5cacd72314810b626aee50df62
(cherry picked from commit
e62f4540cd6ce6289fb0196c8e30c3a3d6905794)
Filip Gruszczynski [Fri, 19 Jun 2015 22:14:53 +0000 (15:14 -0700)]
Make sure home activity gets resumed after started.
When there is only one activity and it gets paused, activity manager will
try resuming some other activity. If there is no other activity, it will
start home activity and try to resume it. This will fail, because the
activity stack doesn't want to enter recursive resuming. We need to
detect this situation and schedule additional resume of top activity
after home gets started.
Bug:
21500945
Change-Id: I6ca703f8d97bcc4001e7da4cd5a5db63bfb5c861
Luan Nguyen [Fri, 19 Jun 2015 21:49:59 +0000 (21:49 +0000)]
am
4fdaf938: docs: Design section fixes for new templates
* commit '
4fdaf938ee28577324a3068b915c01deb61ade78':
docs: Design section fixes for new templates
Quddus Chong [Tue, 16 Jun 2015 19:09:39 +0000 (12:09 -0700)]
docs: Add link from TV design page on DAC to Android TV spec on Google Design site.
bug:
21786976
Change-Id: I7bee3feaa60d5a1a35ce2c1d93b957de150e9b86
Luan Nguyen [Fri, 19 Jun 2015 21:18:18 +0000 (14:18 -0700)]
docs: Design section fixes for new templates
- Fix a number of pages in the Wear design docs
bug:
21762391
Change-Id: I26c18130cdd925d1b40f525dd209329ca2b5cd15
Quddus Chong [Mon, 15 Jun 2015 21:06:16 +0000 (14:06 -0700)]
docs: Updated Recommending TV Content lesson to support card customization.
bug:
21787002
Change-Id: I3c94fbce2ac7efff1749b76af3da47506812972c
Joe Fernandez [Fri, 19 Jun 2015 20:59:03 +0000 (20:59 +0000)]
am
041e01bb: am
003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs
* commit '
041e01bbdffa85b9b5ffba201d36bd566eaa2651':
updates: build-cmdline-update
Joe Fernandez [Fri, 19 Jun 2015 20:45:35 +0000 (20:45 +0000)]
am
003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs
* commit '
003f8567defcb88b2e07b3f85f0b43f74d29b322':
updates: build-cmdline-update
Joe Fernandez [Fri, 19 Jun 2015 20:32:32 +0000 (20:32 +0000)]
Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs
Rich Slogar [Thu, 18 Jun 2015 23:55:44 +0000 (23:55 +0000)]
am
838e4aa6: Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
* commit '
838e4aa6e69f6482adfdde2e45867a36dc1db2b0':
docs: sdk-tools 24.3.3 updates
Rich Slogar [Thu, 18 Jun 2015 23:47:27 +0000 (23:47 +0000)]
Merge "docs: sdk-tools 24.3.3 updates" into mnc-preview-docs
Rich Slogar [Tue, 16 Jun 2015 21:22:08 +0000 (14:22 -0700)]
docs: sdk-tools 24.3.3 updates
Change-Id: I30267355dc17cd6451b28b2aca6d639b9af320d4
Wei Liu [Thu, 18 Jun 2015 23:24:41 +0000 (23:24 +0000)]
am
ae363d2d: Wear doesn\'t need Shell to send notification when bugreport captured.
* commit '
ae363d2db4398a695606c254b88be8940139edd1':
Wear doesn't need Shell to send notification when bugreport captured.
Wei Liu [Sat, 13 Jun 2015 01:06:46 +0000 (18:06 -0700)]
Wear doesn't need Shell to send notification when bugreport captured.
b/
19179040
Change-Id: Iec74e1e55adee16c8674f28a6e7d697499b85acf
Quddus Chong [Wed, 17 Jun 2015 16:23:38 +0000 (16:23 +0000)]
am
eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387" into mnc-preview-docs
* commit '
eae09b4a642bb30d5fd8ff90796e410197d71c95':
docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387
Quddus Chong [Wed, 17 Jun 2015 16:13:19 +0000 (16:13 +0000)]
Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug:
21786387" into mnc-preview-docs
Luan Nguyen [Wed, 17 Jun 2015 15:03:04 +0000 (15:03 +0000)]
am
5cef09b0: Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
* commit '
5cef09b07521cf14eb6a9c9dc59276b9b6482bef':
docs: Update JavaDoc links for Watch Face class.
Luan Nguyen [Wed, 17 Jun 2015 15:02:59 +0000 (15:02 +0000)]
am
5980ae8f: Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
* commit '
5980ae8f06d5a56a5bfc763729533d975079b801':
docs: Update JavaDoc reference links for Create Wearable Apps class
Luan Nguyen [Wed, 17 Jun 2015 15:02:55 +0000 (15:02 +0000)]
am
d548b29d: Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
* commit '
d548b29def4006c0a19df090189198e51715bccd':
docs: Update JavaDoc ref links for UI training.
Luan Nguyen [Wed, 17 Jun 2015 14:55:43 +0000 (14:55 +0000)]
Merge "docs: Update JavaDoc links for Watch Face class." into mnc-preview-docs
Luan Nguyen [Wed, 17 Jun 2015 14:54:49 +0000 (14:54 +0000)]
Merge "docs: Update JavaDoc reference links for Create Wearable Apps class" into mnc-preview-docs
Luan Nguyen [Wed, 17 Jun 2015 14:54:27 +0000 (14:54 +0000)]
Merge "docs: Update JavaDoc ref links for UI training." into mnc-preview-docs
Joe Fernandez [Wed, 17 Jun 2015 00:01:57 +0000 (00:01 +0000)]
am
e343e673: Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs
* commit '
e343e673eca0c0e3b943ce7ddd27b37e29a873f4':
Update landing page link to skip the Preview landing page plus copy edit
Joe Fernandez [Tue, 16 Jun 2015 23:54:32 +0000 (23:54 +0000)]
Merge "Update landing page link to skip the Preview landing page plus copy edit" into mnc-preview-docs
Quddus Chong [Tue, 16 Jun 2015 22:05:54 +0000 (22:05 +0000)]
am
375ad9e1: docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug:
21400628
* commit '
375ad9e1ebc327b87f378f1e0d3cf12f058e5f36':
docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required. bug:
21400628
Quddus Chong [Tue, 16 Jun 2015 21:38:52 +0000 (14:38 -0700)]
docs: Updated the TV docs to indicate that SUGGEST_COLUMN_DURATION is required.
bug:
21400628
Change-Id: I001cb429b94bed8e6a7524f2b7c6a7ced240f33d
Quddus Chong [Fri, 12 Jun 2015 18:29:12 +0000 (11:29 -0700)]
docs: Updated Android TV landing page and Live TV training to support channels.
bug:
21786387
Change-Id: I343e00d30d25f46a9081af339ee4c4a2fddba149
Andrew Solovay [Tue, 16 Jun 2015 17:57:03 +0000 (17:57 +0000)]
am
c7965b02: Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs
* commit '
c7965b024d660b62e5500e4bb8a3f942960dddf1':
docs: Added new "100 days" video to AfW landing page
Andrew Solovay [Tue, 16 Jun 2015 17:48:44 +0000 (17:48 +0000)]
Merge "docs: Added new "100 days" video to AfW landing page" into mnc-preview-docs
Quddus Chong [Mon, 15 Jun 2015 22:59:13 +0000 (22:59 +0000)]
am
79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug:
19298571" into mnc-preview-docs
* commit '
79b30681bbe26b95a8705e17957c1063517ec8f3':
docs: Fixed broken links in TV publishing checklist. bug:
19298571
Quddus Chong [Mon, 15 Jun 2015 22:42:41 +0000 (22:42 +0000)]
Merge "docs: Fixed broken links in TV publishing checklist. bug:
19298571" into mnc-preview-docs
Quddus Chong [Mon, 15 Jun 2015 22:27:17 +0000 (15:27 -0700)]
docs: Fixed broken links in TV publishing checklist.
bug:
19298571
Change-Id: I5a4d6df6e7c8dd0e1f9ffb652375fa265b677013
John Spurlock [Mon, 15 Jun 2015 22:39:12 +0000 (22:39 +0000)]
am
c0d84934: am
076c599f: am
1ad5c813: Fix typo in TtsSpan.
* commit '
c0d849348ae9fb36e725d0644a4927e2e5146295':
Fix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 22:23:24 +0000 (22:23 +0000)]
am
076c599f: am
1ad5c813: Fix typo in TtsSpan.
* commit '
076c599feb9a18b250de7020c2f1c01561c509f9':
Fix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 22:11:30 +0000 (22:11 +0000)]
am
1ad5c813: Fix typo in TtsSpan.
* commit '
1ad5c813211d4d855a0d5396855c80653480aaa4':
Fix typo in TtsSpan.
Luan Nguyen [Tue, 9 Jun 2015 17:35:27 +0000 (10:35 -0700)]
docs: Update JavaDoc reference links for Create Wearable Apps class
bug:
21723175
Change-Id: I3afc72be12e4c08b8dfa0380e315ef5709e2b27c
Andrew Solovay [Mon, 15 Jun 2015 18:58:53 +0000 (11:58 -0700)]
docs: Added new "100 days" video to AfW landing page
See first comment for doc stage location.
Change-Id: Ic05d35efe8a8529d6cc45ba4e055a137ce88f945
John Spurlock [Mon, 15 Jun 2015 17:24:02 +0000 (13:24 -0400)]
Fix typo in TtsSpan.
Change-Id: Ic32f141f0c51ee3bee8fd71464f104ef725de880
Diego Perez [Mon, 15 Jun 2015 10:14:30 +0000 (10:14 +0000)]
am
2f710356: am
13c06d6c: am
1f33bdad: am
5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '
2f7103565cf1732d6d1281195cfa49a1564751d7':
Fix for shadows on theme editor
Diego Perez [Mon, 15 Jun 2015 10:14:24 +0000 (10:14 +0000)]
am
df6f63ba: am
2422011d: am
b2411c62: am
ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit '
df6f63badfe2572284dad8e34f152fd1c24a873e':
Fix GcSnapshot drawInLayer when clipping is used.
Diego Perez [Mon, 15 Jun 2015 10:04:02 +0000 (10:04 +0000)]
am
13c06d6c: am
1f33bdad: am
5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '
13c06d6c91e67962b7ffdf92c56e3b01125e4a8d':
Fix for shadows on theme editor
Diego Perez [Mon, 15 Jun 2015 10:03:58 +0000 (10:03 +0000)]
am
2422011d: am
b2411c62: am
ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit '
2422011d867f4d4516605148641bbeb7d9c2501b':
Fix GcSnapshot drawInLayer when clipping is used.
Diego Perez [Mon, 15 Jun 2015 09:50:58 +0000 (09:50 +0000)]
am
1f33bdad: am
5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '
1f33bdad98dd5138f887642d39c9495e1d7df14b':
Fix for shadows on theme editor
Diego Perez [Mon, 15 Jun 2015 09:50:51 +0000 (09:50 +0000)]
am
b2411c62: am
ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit '
b2411c622cf9124f6af5f70d416adb179f9c88bb':
Fix GcSnapshot drawInLayer when clipping is used.
Diego Perez [Mon, 15 Jun 2015 09:36:39 +0000 (09:36 +0000)]
am
5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev
* commit '
5e50e00c663a5d0b11d1f41509e1fb4e56d166f1':
Fix for shadows on theme editor
Diego Perez [Mon, 15 Jun 2015 09:36:34 +0000 (09:36 +0000)]
am
ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
* commit '
ead59b0d479c3a911be87261b523255e8e51f76a':
Fix GcSnapshot drawInLayer when clipping is used.
Diego Perez [Mon, 15 Jun 2015 08:34:56 +0000 (08:34 +0000)]
Merge "Fix for shadows on theme editor" into lmp-mr1-dev
Diego Perez [Mon, 15 Jun 2015 08:34:01 +0000 (08:34 +0000)]
Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev
Dirk Dougherty [Sat, 13 Jun 2015 02:57:04 +0000 (02:57 +0000)]
am
4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs
* commit '
4decc115ae4fc846fffda238569d6c55451a63af':
Doc change: move ndk docs jd into main docs tree.
Dirk Dougherty [Sat, 13 Jun 2015 02:43:41 +0000 (02:43 +0000)]
Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs
Dirk Dougherty [Fri, 12 Jun 2015 01:59:34 +0000 (18:59 -0700)]
Doc change: move ndk docs jd into main docs tree.
Change-Id: I5c1ac7645dc68c28da97f46babcab5926c38dbea
Andrew Solovay [Fri, 12 Jun 2015 20:48:58 +0000 (20:48 +0000)]
am
6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs
* commit '
6243dfd9ab25dfd11d0e09cbe02e8a863ddafe07':
docs: Added AfW videos to "Android for Work" landing page
Andrew Solovay [Fri, 12 Jun 2015 20:37:43 +0000 (20:37 +0000)]
Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs
Rich Slogar [Fri, 12 Jun 2015 17:40:29 +0000 (17:40 +0000)]
am
726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs
* commit '
726db0aff535e7e734426c6c33ae2c5443e34fa5':
docs: sdk tools 24.3.2 download updates
Luan Nguyen [Wed, 10 Jun 2015 15:19:50 +0000 (08:19 -0700)]
docs: Update JavaDoc links for Watch Face class.
bug:
21731309
Change-Id: I4d0899f42e3150aad399efc8d1e1e4f63dc6bc9d
Rich Slogar [Fri, 12 Jun 2015 17:26:56 +0000 (17:26 +0000)]
Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs
Diego Perez [Fri, 12 Jun 2015 16:29:59 +0000 (16:29 +0000)]
am
d717682d: am
5c597c1d: am
a8854564: am
ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit '
d717682df97e812d4a25f93b0c9e84548767d8e1':
New custom widgets library
Diego Perez [Fri, 12 Jun 2015 16:29:54 +0000 (16:29 +0000)]
am
c051c556: am
e10e8005: am
68155986: am
f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
* commit '
c051c556669f88e284f2922f8d28fad2138598ae':
Fix crash when shadowSize is 0
Prashant Malani [Fri, 12 Jun 2015 16:29:47 +0000 (16:29 +0000)]
am
327b481f: (-s ours) am
786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '
327b481f1f2499eaa5ab938e63a2c12c21fe7482':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
Filip Gruszczynski [Fri, 12 Jun 2015 16:29:39 +0000 (16:29 +0000)]
am
88bc9753: Merge "DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes" into cw-d-mr1-dev
* commit '
88bc9753c30c9ab3c92d074ae49520cfa2258b16':
DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes
Leon Scroggins III [Fri, 12 Jun 2015 16:29:13 +0000 (16:29 +0000)]
am
265d053d: am
81babaa3: am
7ffde4a6: am
e899576f: am
48b38452: am
a6932472: am
5b751c80: (-s ours) am
7496e153: am
0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
* commit '
265d053da9203ebad0f2e936fa66305babc8fdae':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Leon Scroggins III [Fri, 12 Jun 2015 16:29:07 +0000 (16:29 +0000)]
am
303581be: resolved conflicts for merge of
3ff978a5 to cw-d-mr1-dev
* commit '
303581be5ba3875b0501cb8aa00a0228e22a6cc6':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Svetoslav [Fri, 12 Jun 2015 16:29:03 +0000 (16:29 +0000)]
am
49717697: am
34c7bd7c: am
74e04083: am
07264d93: am
18fb1c92: (-s ours) am
bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity.
* commit '
497176975f59a939f12feefb31f2f02560b6f265':
DO NOT MERGE Don't take flags when creating app widget config activity.
Diego Perez [Fri, 12 Jun 2015 15:10:18 +0000 (15:10 +0000)]
am
5c597c1d: am
a8854564: am
ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit '
5c597c1d89c529675096c2d326c452145403979d':
New custom widgets library
Diego Perez [Fri, 12 Jun 2015 15:10:14 +0000 (15:10 +0000)]
am
e10e8005: am
68155986: am
f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
* commit '
e10e8005903572158cbb9c7f869508a247ff51ad':
Fix crash when shadowSize is 0
Diego Perez [Fri, 12 Jun 2015 14:57:35 +0000 (14:57 +0000)]
am
a8854564: am
ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit '
a885456426ec267d37c6a527285d965f81e14f9d':
New custom widgets library
Diego Perez [Fri, 12 Jun 2015 14:57:27 +0000 (14:57 +0000)]
am
68155986: am
f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
* commit '
68155986508ef8b497228f8e60346d317e87991d':
Fix crash when shadowSize is 0
Diego Perez [Fri, 12 Jun 2015 14:45:26 +0000 (14:45 +0000)]
am
ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev
* commit '
ce4a9d9110436a2ea825976af7895c58303a3dac':
New custom widgets library
Diego Perez [Fri, 12 Jun 2015 14:45:21 +0000 (14:45 +0000)]
am
f5a99437: Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
* commit '
f5a99437bf203eca49e8ab8f74f2c206c551289b':
Fix crash when shadowSize is 0
Luan Nguyen [Mon, 8 Jun 2015 22:05:58 +0000 (15:05 -0700)]
docs: Update JavaDoc ref links for UI training.
Update sample snippets in 2d-picker.
bug:
21660558
bug:
19059844
Change-Id: Ibc156a21329d1549f6d33ed75130f7b6edda85b2
Diego Perez [Fri, 12 Jun 2015 14:34:48 +0000 (14:34 +0000)]
Merge "New custom widgets library" into lmp-mr1-dev
Diego Perez [Fri, 12 Jun 2015 14:34:08 +0000 (14:34 +0000)]
Merge "Fix crash when shadowSize is 0" into lmp-mr1-dev
Dirk Dougherty [Fri, 12 Jun 2015 01:45:36 +0000 (01:45 +0000)]
am
ef8c2834: Merge "Doc change: miscellaneous tag optimizations and edits." into mnc-preview-docs
* commit '
ef8c2834f19c404cad025a4b583525b62a4b2790':
Doc change: miscellaneous tag optimizations and edits.
Dirk Dougherty [Fri, 12 Jun 2015 01:34:37 +0000 (01:34 +0000)]
Merge "Doc change: miscellaneous tag optimizations and edits." into mnc-preview-docs
Dirk Dougherty [Thu, 11 Jun 2015 18:53:40 +0000 (11:53 -0700)]
Doc change: miscellaneous tag optimizations and edits.
Change-Id: I9da06cdf950894b32eedb0b63b5b7a9eb2d52003
Rich Slogar [Fri, 12 Jun 2015 00:21:20 +0000 (17:21 -0700)]
docs: sdk tools 24.3.2 download updates
Change-Id: Ie7a008e1b1a7a686436a72e049f8b7e6c1a66350
Prashant Malani [Thu, 11 Jun 2015 23:52:49 +0000 (23:52 +0000)]
am
786cd12f: (-s ours) Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
* commit '
786cd12f785374f93c19c909687ea300e41ffbc2':
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
Prashant Malani [Thu, 11 Jun 2015 23:36:42 +0000 (23:36 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev
Rich Slogar [Thu, 11 Jun 2015 23:25:13 +0000 (23:25 +0000)]
am
e9dd30b2: Merge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs
* commit '
e9dd30b27687ecc0e152f73eec05399af1c04bb3':
docs: sdk tools 24.3.2 updates
Rich Slogar [Thu, 11 Jun 2015 23:09:26 +0000 (23:09 +0000)]
Merge "docs: sdk tools 24.3.2 updates" into mnc-preview-docs
Eric Gilmore [Thu, 11 Jun 2015 23:08:56 +0000 (23:08 +0000)]
am
2f414b76: Merge "Removing traces out outdated GCM training class." into mnc-preview-docs
* commit '
2f414b7612e095c383fb4052c671634d82940654':
Removing traces out outdated GCM training class.
Eric Gilmore [Thu, 11 Jun 2015 22:58:31 +0000 (22:58 +0000)]
Merge "Removing traces out outdated GCM training class." into mnc-preview-docs
Joe Fernandez [Thu, 11 Jun 2015 22:56:20 +0000 (22:56 +0000)]
am
e4e40c03: docs: remove obsolete FAQ pages
* commit '
e4e40c0347e76ea4afaf7d442c4daeb9f08b2d91':
docs: remove obsolete FAQ pages
Rich Slogar [Thu, 11 Jun 2015 20:56:37 +0000 (13:56 -0700)]
docs: sdk tools 24.3.2 updates
Change-Id: I3eb7b789985653614361505eea3aa0040ef5ea52
Joe Fernandez [Thu, 11 Jun 2015 22:30:42 +0000 (15:30 -0700)]
docs: remove obsolete FAQ pages
These pages have not been maintained and have not been included in the
DAC navigation structure for some time.
b/
19413080
redirects change: If512bdf55b16f0faf21de7db81ab26d59489da15
Change-Id: Ibc1aa5c691edb938cbb7d4b2d885f1ea8a5f6ef4
Prashant Malani [Thu, 11 Jun 2015 00:43:49 +0000 (17:43 -0700)]
DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"
This reverts commit
c83d3e4b72f8f25bbac39a577f125f0ca04354da.
While the above patch does help deal with the issue of "lost" kernel
alarms, experiments found it to also cause the unnecessary duplicate
setting of non-lost alarms in other devices.
This leads to a situation where the CPU constantly tries to sleep, but
occasionally keeps failing to do so, because of a collection of these
duplicate alarms constantly activating the "alarm" kernel wakeup source
, presumably due to them being triggered.
These might have accumulated over several iterations when the kernel
alarms were set again (via rescheduleKernelAlarmsLocked()).
To prevent the CPU thrashing (which heavily drains power on more
battery-constrained devices, and increases the number of alarms being
set), the aforementioned commit is backed out.
Bug:
20136729
Change-Id: I2a189cb303deb78a2faf476b0e789445407f3e11
Dirk Dougherty [Thu, 11 Jun 2015 17:40:53 +0000 (17:40 +0000)]
am
fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs
* commit '
fd7432276172790a27bd51b75e61d756772eb33b':
Doc change: Remove disallow /preview from indexing.
Dirk Dougherty [Thu, 11 Jun 2015 17:31:44 +0000 (17:31 +0000)]
Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs
OSDN Git Service
