OSDN Git Service
Rich Slogar [Tue, 30 Jun 2015 22:31:52 +0000 (22:31 +0000)]
am
761b4a7d: Merge "docs: migration guide link update" into mnc-preview-docs
* commit '
761b4a7deb2438e039fdb11a05e2de41593ffd8f':
docs: migration guide link update
Rich Slogar [Tue, 30 Jun 2015 22:21:16 +0000 (22:21 +0000)]
Merge "docs: migration guide link update" into mnc-preview-docs
Filip Gruszczynski [Tue, 30 Jun 2015 22:17:55 +0000 (22:17 +0000)]
am
96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
* commit '
96496e2d17607a8bfa944461c2458b0dcdeee872':
Build fix after changing IWindowSession.
Filip Gruszczynski [Tue, 30 Jun 2015 22:02:32 +0000 (22:02 +0000)]
Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev
Luan Nguyen [Tue, 30 Jun 2015 22:02:23 +0000 (22:02 +0000)]
am
ed053477: Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs
* commit '
ed053477d0f76edad4853f0a5aac275acfe2d6ce':
docs: Move scale Bitmap code to onSurfaceChanged
Amit Mahajan [Tue, 30 Jun 2015 21:55:08 +0000 (21:55 +0000)]
am
71699d76: am
95c47354: am
43d3bd02: am
83631047: am
22766e85: am
bcf9223b: am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
71699d760eff662055dde458ea0d614a32fb6dfc':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 21:55:01 +0000 (21:55 +0000)]
am
cbbbabaa: am
4c8ecd9a: am
72356f0b: am
f1686ac2: am
88c2d704: am
4bd25634: am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
cbbbabaa4aa1cbb84cb49133ecda1da2f06daf54':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Luan Nguyen [Tue, 30 Jun 2015 21:53:15 +0000 (21:53 +0000)]
Merge "docs: Move scale Bitmap code to onSurfaceChanged" into mnc-preview-docs
Filip Gruszczynski [Tue, 30 Jun 2015 21:42:21 +0000 (14:42 -0700)]
Build fix after changing IWindowSession.
Change-Id: I339fecb0138e8b8907fc53372b694021f6327260
Amit Mahajan [Tue, 30 Jun 2015 21:40:32 +0000 (21:40 +0000)]
am
95c47354: am
43d3bd02: am
83631047: am
22766e85: am
bcf9223b: am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
95c47354a6841d7ae3a81fcacea5acdd25dc42c6':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 21:40:27 +0000 (21:40 +0000)]
am
4c8ecd9a: am
72356f0b: am
f1686ac2: am
88c2d704: am
4bd25634: am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
4c8ecd9a70b3ba1bbf0b546c6189a892e63a6f18':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Amit Mahajan [Tue, 30 Jun 2015 21:23:41 +0000 (21:23 +0000)]
am
43d3bd02: am
83631047: am
22766e85: am
bcf9223b: am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
43d3bd027604f400caf49826e5b4705784937b35':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 21:23:34 +0000 (21:23 +0000)]
am
72356f0b: am
f1686ac2: am
88c2d704: am
4bd25634: am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
72356f0b20d4e6d84430629c2bb7d8baac55002d':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Rich Slogar [Tue, 30 Jun 2015 21:22:50 +0000 (21:22 +0000)]
am
3de121f9: Merge "docs: studio workflow page typo" into mnc-preview-docs
* commit '
3de121f94c1ee4624e263aede6e2f7af7231b968':
docs: studio workflow page typo
Luan Nguyen [Tue, 30 Jun 2015 19:13:48 +0000 (12:13 -0700)]
docs: Move scale Bitmap code to onSurfaceChanged
bug:
21099578
Change-Id: I5e8d1c6c1757ec512ff2695689bc5b8c2c88706f
Rich Slogar [Tue, 30 Jun 2015 20:38:23 +0000 (20:38 +0000)]
Merge "docs: studio workflow page typo" into mnc-preview-docs
Rich Slogar [Tue, 30 Jun 2015 19:36:09 +0000 (12:36 -0700)]
docs: migration guide link update
b.android/178474
Change-Id: Ie0c54b1eb4d47426da4e09cfea0ede7dde3c7a91
Robert Schaub [Tue, 30 Jun 2015 20:26:36 +0000 (20:26 +0000)]
am
fae35eed: Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs
* commit '
fae35eed99d6bc87f3a864bdd16d951136a16cc7':
docs: Changed link in Java source code comment to repair 404
Filip Gruszczynski [Tue, 30 Jun 2015 20:20:48 +0000 (20:20 +0000)]
am
0ec1328f: Calculate outset hint when adding window.
* commit '
0ec1328f85a08a610868856c688ebb8196c79c17':
Calculate outset hint when adding window.
Amit Mahajan [Tue, 30 Jun 2015 20:11:48 +0000 (20:11 +0000)]
am
83631047: am
22766e85: am
bcf9223b: am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
8363104782302c08f2f03d4e1e345edb7f20876c':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 20:11:40 +0000 (20:11 +0000)]
am
f1686ac2: am
88c2d704: am
4bd25634: am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
f1686ac225c75991d931348818065f9e99cf0b73':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Robert Schaub [Tue, 30 Jun 2015 20:06:24 +0000 (20:06 +0000)]
Merge "docs: Changed link in Java source code comment to repair 404" into mnc-preview-docs
Amit Mahajan [Tue, 30 Jun 2015 20:00:00 +0000 (20:00 +0000)]
am
22766e85: am
bcf9223b: am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
22766e85d8b7bbedaa28a409f34120c4f3d4a2d3':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 19:59:53 +0000 (19:59 +0000)]
am
88c2d704: am
4bd25634: am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
88c2d704c3bbb58a676b4b1164b1c98aecdf467d':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Amit Mahajan [Tue, 30 Jun 2015 19:45:08 +0000 (19:45 +0000)]
am
bcf9223b: am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
bcf9223b3bbe542d0ab040398c26cf1c600f5493':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 19:45:03 +0000 (19:45 +0000)]
am
4bd25634: am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
4bd25634f13876e7ab31b6de66ceb9ca1cdc784d':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Filip Gruszczynski [Thu, 25 Jun 2015 18:26:01 +0000 (11:26 -0700)]
Calculate outset hint when adding window.
Outsets aren't dynamic so they are a great candidate for a hint when the
window is added through the window manager. Thanks to this during first
view hierarchy measure or wallpaper window layout they are immediately
available and don't require multiple measure/layout passes.
Bug:
21593814
Change-Id: I573c15ffbbe4fcd8a6ed9c5e4fcd6cfbbcd7434f
Robert Schaub [Tue, 30 Jun 2015 00:21:20 +0000 (17:21 -0700)]
docs: Changed link in Java source code comment to repair 404
Need to find out what developer is in charge of CardEmulation.java to include
in review.
Bug:
19950839
Change-Id: Ic30ebaf69e46a70a64c8a123b0f72abaff7d0b80
Rich Slogar [Tue, 30 Jun 2015 19:01:04 +0000 (12:01 -0700)]
docs: studio workflow page typo
b.android/178485
Change-Id: I26da96cd5d08ad72c99dba9a72a427d050986507
Bryce Lee [Tue, 30 Jun 2015 18:34:47 +0000 (18:34 +0000)]
am
cc2ba220: Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev
* commit '
cc2ba2200ddc9d95753fa930aa245540fac880e8':
Only enable theater mode by button press after setup.
Amit Mahajan [Tue, 30 Jun 2015 18:21:50 +0000 (18:21 +0000)]
am
23444e76: (-s ours) am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
23444e76d2480d2537c2b6418f0c6c89c8cdb590':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Joe Fernandez [Tue, 30 Jun 2015 18:21:41 +0000 (18:21 +0000)]
am
765255b4: am
6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '
765255b41229553842da855b8e5d9dfa87cf8e2b':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Bryce Lee [Tue, 30 Jun 2015 17:13:02 +0000 (17:13 +0000)]
Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev
David Friedman [Tue, 30 Jun 2015 01:58:57 +0000 (01:58 +0000)]
am
9f2e92ee: Merge "Docs: Localized M-Preview pages Bug:
21789313" into mnc-preview-docs
* commit '
9f2e92eebd05d8f37ae5f8383b4a0d63d51a9654':
Docs: Localized M-Preview pages Bug:
21789313
David Friedman [Tue, 30 Jun 2015 01:51:35 +0000 (01:51 +0000)]
Merge "Docs: Localized M-Preview pages Bug:
21789313" into mnc-preview-docs
David Friedman [Mon, 29 Jun 2015 23:03:08 +0000 (16:03 -0700)]
Docs: Localized M-Preview pages
Bug:
21789313
Change-Id: Ifb4a45a65acd7b786e05bdf7b7dd86698093fbdf
Andrew Solovay [Mon, 29 Jun 2015 21:55:09 +0000 (21:55 +0000)]
am
350286e6: Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
* commit '
350286e613cdde99f347bd115c406e790a242f87':
docs: Clarified when you can put the fragments in the root view.
Andrew Solovay [Mon, 29 Jun 2015 21:42:46 +0000 (21:42 +0000)]
Merge "docs: Clarified when you can put the fragments in the root view." into mnc-preview-docs
Filip Gruszczynski [Mon, 29 Jun 2015 20:59:50 +0000 (20:59 +0000)]
am
b6c158f9: Merge "Dump of previous vibrations." into cw-d-mr1-dev
* commit '
b6c158f9d863768d5d8315f2a4a4bb87c4db2fea':
Dump of previous vibrations.
Filip Gruszczynski [Mon, 29 Jun 2015 20:47:07 +0000 (20:47 +0000)]
Merge "Dump of previous vibrations." into cw-d-mr1-dev
Filip Gruszczynski [Fri, 26 Jun 2015 01:35:00 +0000 (18:35 -0700)]
Dump of previous vibrations.
It's hard to find previous vibrations when you chase excessive use that
impacts the battery. A dump of previous vibrations allows us to
investigate where the vibrations come from.
Bug:
21933068
Change-Id: I14944732927c73401e5adc7345ea9823092b1883
Amit Mahajan [Fri, 26 Jun 2015 23:26:27 +0000 (23:26 +0000)]
am
ad6a2da8: am
2da8a992: am
b98f786c: am
5b8976a5: am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
ad6a2da84800e47048a8c2a83eeb343cee6aaa9c':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 23:12:05 +0000 (23:12 +0000)]
am
2da8a992: am
b98f786c: am
5b8976a5: am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
2da8a992cb2afc25ac6df84da449944ea08f0c57':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:55:47 +0000 (22:55 +0000)]
am
d98e7c1d: am
7278b043: am
895eb134: am
90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:55:18 +0000 (22:55 +0000)]
am
b98f786c: am
5b8976a5: am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
b98f786c8acfaed27ee733dde0aa0fd255a09afc':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:35:46 +0000 (22:35 +0000)]
am
7278b043: am
895eb134: am
90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
7278b04383cb6c01c2fbb184c560875ab709dea5':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:34:59 +0000 (22:34 +0000)]
am
5b8976a5: am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
5b8976a5eaffe81a742ec2600cf9b63e911f978c':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Rich Slogar [Fri, 26 Jun 2015 22:34:49 +0000 (22:34 +0000)]
am
3686e043: am
268a7c19: am
fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs
* commit '
3686e0430f8366e2f4de867eeabfd1b7fe4aefc0':
docs: manifest merger updates
Amit Mahajan [Fri, 26 Jun 2015 22:31:49 +0000 (22:31 +0000)]
am
eee86342: am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
eee86342713a7c89c30933a22f8b7e190d3af10f':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Rich Slogar [Fri, 26 Jun 2015 22:25:35 +0000 (22:25 +0000)]
am
268a7c19: am
fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs
* commit '
268a7c190c37a7a63bd1134c4dfb8aacf71c211e':
docs: manifest merger updates
Amit Mahajan [Fri, 26 Jun 2015 22:19:29 +0000 (22:19 +0000)]
am
853c6178: am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
853c61788387c38c1103f26b1c8c028da5676776':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:18:01 +0000 (22:18 +0000)]
am
895eb134: am
90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
895eb134751ec1495baa30362a514275624e5843':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:14:24 +0000 (22:14 +0000)]
am
9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
9edf7ad563ead119698ac3106b699515bd160ffe':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Rich Slogar [Fri, 26 Jun 2015 22:11:44 +0000 (22:11 +0000)]
am
fc7e84b3: Merge "docs: manifest merger updates" into lmp-docs
* commit '
fc7e84b36b77ac95e61bd1736eebdc307ba6e09e':
docs: manifest merger updates
Amit Mahajan [Fri, 26 Jun 2015 22:03:46 +0000 (22:03 +0000)]
am
791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
791dd2c67466d2d9dafe58b1258e7718e3f30bc0':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Amit Mahajan [Fri, 26 Jun 2015 22:03:10 +0000 (22:03 +0000)]
am
90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '
90224355cd6bd54fa7a9ec30c1cecc573104a3e3':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Rich Slogar [Fri, 26 Jun 2015 21:56:23 +0000 (21:56 +0000)]
Merge "docs: manifest merger updates" into lmp-docs
Prashant Malani [Fri, 26 Jun 2015 21:12:49 +0000 (21:12 +0000)]
am
9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev
* commit '
9a3eacbe9ce0e6a65429c721b6f4e60a28dbdaab':
Revert "Always re-establish kernel alarms when considering new alarm set"
Prashant Malani [Fri, 26 Jun 2015 21:00:09 +0000 (21:00 +0000)]
Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev
Robert Schaub [Fri, 26 Jun 2015 20:00:51 +0000 (20:00 +0000)]
am
2a1be1bc: Docs: Added declaration to code fragment Bug:
21030774
* commit '
2a1be1bc387a97e86dac4d77d269d07eff71de41':
Docs: Added declaration to code fragment Bug:
21030774
Rich Slogar [Wed, 4 Feb 2015 18:56:46 +0000 (10:56 -0800)]
docs: manifest merger updates
Change-Id: I0a1c311ba08077b15ee1823146773b7d07162dd4
Robert Schaub [Fri, 26 Jun 2015 18:11:19 +0000 (11:11 -0700)]
Docs: Added declaration to code fragment
Bug:
21030774
Change-Id: Ic906454b20ec9606e5ca11a0fbd0388492eecf42
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Wei Liu [Fri, 26 Jun 2015 17:33:16 +0000 (17:33 +0000)]
am
6f6326bc: Implement a exponential backoff for NTP time and XTRA data retry.
* commit '
6f6326bc75be652a0b88b73fd6e0b73dbe2fabb6':
Implement a exponential backoff for NTP time and XTRA data retry.
Rich Slogar [Fri, 26 Jun 2015 07:06:31 +0000 (07:06 +0000)]
am
fd3b64b8: am
b0afc540: docs: Eclipse ADT end-of-life note
* commit '
fd3b64b8aa0aa974bcc69340e426cc0da92e71ae':
docs: Eclipse ADT end-of-life note
Rich Slogar [Fri, 26 Jun 2015 06:53:20 +0000 (06:53 +0000)]
am
b0afc540: docs: Eclipse ADT end-of-life note
* commit '
b0afc540ebee64ded367ce34ae8f61cb8c2478e7':
docs: Eclipse ADT end-of-life note
Rich Slogar [Fri, 26 Jun 2015 00:48:35 +0000 (17:48 -0700)]
docs: Eclipse ADT end-of-life note
Change-Id: I5fe9de7145104191d330259c7e16ea14cc4a651e
Rich Slogar [Fri, 26 Jun 2015 05:52:55 +0000 (05:52 +0000)]
am
7d377c3b: am
fa5f184f: docs: studio migration guide
* commit '
7d377c3b4f3837655c724b4508c7251d298f9765':
docs: studio migration guide
Rich Slogar [Fri, 26 Jun 2015 05:39:31 +0000 (05:39 +0000)]
am
fa5f184f: docs: studio migration guide
* commit '
fa5f184faf7da28e3a6d2acd18bb9bfaac4eb2f1':
docs: studio migration guide
Rich Slogar [Tue, 12 May 2015 19:42:11 +0000 (12:42 -0700)]
docs: studio migration guide
b/
20093866
Change-Id: Ib1eed6870aaee6230a083ec5f126a36b4b3a014d
Wei Liu [Thu, 25 Jun 2015 06:47:50 +0000 (23:47 -0700)]
Implement a exponential backoff for NTP time and XTRA data retry.
b/
21904128
Change-Id: I9fc8917eed3065ff0a4946c5a3bdecb9e93da19d
Robert Schaub [Thu, 25 Jun 2015 19:06:53 +0000 (19:06 +0000)]
am
0b5d0509: Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs
* commit '
0b5d0509ad381fc7ab519a60e2d749f27db7a070':
docs: Removed sentence from permissions doc
Robert Schaub [Thu, 25 Jun 2015 18:57:05 +0000 (18:57 +0000)]
Merge "docs: Removed sentence from permissions doc" into mnc-preview-docs
Bryce Lee [Thu, 25 Jun 2015 17:54:06 +0000 (10:54 -0700)]
Only enable theater mode by button press after setup.
Bug:
21751167
Change-Id: I7f69ff767aaea97829e8eb6f5f13faace1aae416
Anthony Hugh [Thu, 25 Jun 2015 01:27:41 +0000 (01:27 +0000)]
am
001df9ca: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
001df9ca900f3098222a4920a0048d2eb947bd4e':
DO NOT MERGE: Introduce stem keycodes for Wear
Prashant Malani [Thu, 11 Jun 2015 00:43:49 +0000 (17:43 -0700)]
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.
Change-Id: I2a189cb303deb78a2faf476b0e789445407f3e11
(cherry picked from commit
d19ffd4f2ca4130c41dd5f6baddad1830598ecbc)
Anthony Hugh [Tue, 23 Jun 2015 17:44:17 +0000 (10:44 -0700)]
DO NOT MERGE: Introduce stem keycodes for Wear
Cherry-pick from master
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG:
21903503
Change-Id: I867cf79554c72d42c8acbb3ff8b1678e482d4fe2
Joe Fernandez [Wed, 24 Jun 2015 21:38:28 +0000 (21:38 +0000)]
am
3eefa1f9: Merge "docs: Update Android support page" into mnc-preview-docs
* commit '
3eefa1f9de9e6466251373074f3c720936b62a8c':
docs: Update Android support page
Joe Fernandez [Wed, 24 Jun 2015 21:30:02 +0000 (21:30 +0000)]
Merge "docs: Update Android support page" into mnc-preview-docs
Joe Fernandez [Wed, 24 Jun 2015 20:48:26 +0000 (13:48 -0700)]
docs: Update Android support page
- remove Helpouts
- remove Merchant issue reporting link
- remove other dead links
- clean up page code
b\
18579472
b\
19355066
Change-Id: If55aa57b11604bdd328c55e26ad5bd4ba0b32de7
Robert Schaub [Wed, 24 Jun 2015 20:19:49 +0000 (13:19 -0700)]
docs: Removed sentence from permissions doc
Bug:
21788582
Change-Id: Ifffed46dece0adb00671199c26c2fe995c4179ea
Andrew Solovay [Wed, 24 Jun 2015 20:15:17 +0000 (20:15 +0000)]
am
00ebd145: docs: Added "Single Use Devices" video to Android for Work main page
* commit '
00ebd145d1572e0d12403ed0194d540926996f0e':
docs: Added "Single Use Devices" video to Android for Work main page
Andrew Solovay [Wed, 24 Jun 2015 18:56:56 +0000 (11:56 -0700)]
docs: Added "Single Use Devices" video to Android for Work main page
See first comment for doc stage location.
Change-Id: I0b64f8462eebc5d11c7972fd49147fdd1d6cdd3a
Luan Nguyen [Wed, 24 Jun 2015 15:16:57 +0000 (15:16 +0000)]
am
c5a480d1: am
fdad629f: am
6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
* commit '
c5a480d112f6ce8645d9e294c42b2baab3b56ab9':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
Luan Nguyen [Wed, 24 Jun 2015 15:05:13 +0000 (15:05 +0000)]
am
fdad629f: am
6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
* commit '
fdad629fc089783fa0b3caad62ba99a9083f8645':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
Luan Nguyen [Wed, 24 Jun 2015 14:51:30 +0000 (14:51 +0000)]
am
6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
* commit '
6859a9f09049d1dc760b98a6cbb278b591de63a6':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
Luan Nguyen [Wed, 24 Jun 2015 14:43:29 +0000 (14:43 +0000)]
Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
Bryce Lee [Tue, 23 Jun 2015 23:04:26 +0000 (23:04 +0000)]
am
65dca454: Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev
* commit '
65dca454c7a717b001b51d0089e7565ba428ce87':
Turn off theater mode upon power button press.
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
Bryce Lee [Tue, 23 Jun 2015 18:10:39 +0000 (18:10 +0000)]
Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev
Luan Nguyen [Fri, 16 Jan 2015 16:21:57 +0000 (08:21 -0800)]
docs: Pare down the adb guide and remove sections that are duplicated
in the tools list.
bug:
12879186
Change-Id: Ic2d17ef29eac15a9ffc40e05b056dc17d71069e8
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.
Andrew Solovay [Mon, 15 Jun 2015 21:01:44 +0000 (14:01 -0700)]
docs: Clarified when you can put the fragments in the root view.
Per bug b/
10641907, putting fragments in the root view *only* works
if the device runs Android 3.0 or later. Chris and Adam say
we don't really want to suggest that work flow even for these devices,
so I'm taking that info out.
bug:
10641907
Change-Id: Ie44acbb534b8e0cea8dbbfaaf2c65836b1c31be6
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