OSDN Git Service
quddusc [Sat, 5 Apr 2014 22:32:35 +0000 (22:32 +0000)]
am
b430ec75: am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
b430ec756473330f47bda2d8f0c266b3398169c9':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:27:25 +0000 (22:27 +0000)]
am
7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
* commit '
7db3875cdca4c94cb667d2d0cc86718f15e3305c':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101
quddusc [Sat, 5 Apr 2014 22:23:35 +0000 (22:23 +0000)]
Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug:
13487101" into klp-docs
Etienne Le Grand [Sat, 5 Apr 2014 04:47:14 +0000 (04:47 +0000)]
Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
This reverts commit
fd53d8352a4617941b0a0449390aa562a01ea1d3.
Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
Etienne Le Grand [Tue, 25 Mar 2014 04:29:28 +0000 (21:29 -0700)]
Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
Katie McCormick [Fri, 4 Apr 2014 21:31:28 +0000 (21:31 +0000)]
am
f7bffe77: am
fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs
* commit '
f7bffe7707f31da920a8ff08d013934562e9a43d':
Doc Update: notification bug fix.
Katie McCormick [Fri, 4 Apr 2014 21:17:29 +0000 (21:17 +0000)]
am
fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs
* commit '
fc8ea92df15689d51079212d7d012756ce9298d2':
Doc Update: notification bug fix.
Katie McCormick [Fri, 4 Apr 2014 21:12:16 +0000 (21:12 +0000)]
Merge "Doc Update: notification bug fix." into klp-docs
Katie McCormick [Fri, 4 Apr 2014 21:04:36 +0000 (14:04 -0700)]
Doc Update: notification bug fix.
Fixes:
b/
13429906
Change-Id: I5c5c12cb244351f71d043c4fb4495828b02ca362
John Spurlock [Fri, 4 Apr 2014 19:24:09 +0000 (19:24 +0000)]
Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
John Spurlock [Thu, 3 Apr 2014 20:37:27 +0000 (16:37 -0400)]
Introduce new UI_MODE_TYPE_WATCH and qualifier.
Default ui mode to watch if we have FEATURE_WATCH.
Bug:
13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
Ricardo Cervera [Fri, 4 Apr 2014 17:42:44 +0000 (17:42 +0000)]
am
5df82523: am
ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
* commit '
5df825237afd016c48dd3577d839825e5161d3e7':
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Ricardo Cervera [Fri, 4 Apr 2014 17:38:59 +0000 (17:38 +0000)]
am
ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
* commit '
ff3d89c08cd69c506ea07fb30a58f88e188b2dd9':
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Ricardo Cervera [Fri, 4 Apr 2014 17:32:57 +0000 (17:32 +0000)]
Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 17:32:42 +0000 (17:32 +0000)]
am
a821af68: am
715139a6: Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
* commit '
a821af684e2a5f814fc8709518b5f0589c81661e':
docs: Fixed action bar example. Bug:
13806963
Ricardo Cervera [Fri, 4 Apr 2014 17:29:00 +0000 (17:29 +0000)]
am
715139a6: Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
* commit '
715139a620383c89e061a2b0650e184bf3382a10':
docs: Fixed action bar example. Bug:
13806963
Ricardo Cervera [Fri, 4 Apr 2014 17:26:05 +0000 (10:26 -0700)]
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
Change-Id: I02e17c358630ab298bb99731723405cdeae701fc
Ricardo Cervera [Fri, 4 Apr 2014 17:23:08 +0000 (17:23 +0000)]
Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 17:01:35 +0000 (17:01 +0000)]
am
e2bdd6ae: am
6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
* commit '
e2bdd6ae33640430fc4a0d58c263d5af94fdee77':
docs: Updated the link to buy a Nexus phone. Bug:
13671312
Ricardo Cervera [Fri, 4 Apr 2014 16:55:02 +0000 (16:55 +0000)]
am
6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
* commit '
6ae21ea7fb37c76429a48a41987c9c0e2c067c31':
docs: Updated the link to buy a Nexus phone. Bug:
13671312
Ricardo Cervera [Fri, 4 Apr 2014 16:51:20 +0000 (16:51 +0000)]
Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
Ricardo Cervera [Fri, 4 Apr 2014 16:46:11 +0000 (09:46 -0700)]
docs: Fixed action bar example. Bug:
13806963
Change-Id: I27dd1b80cf13eb3d47f48992db535de5a62bcde9
Ricardo Cervera [Fri, 4 Apr 2014 16:30:02 +0000 (16:30 +0000)]
am
c23ab90c: am
07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
* commit '
c23ab90c80c76c0f5249190ff26dac1fa5992d3b':
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
Ricardo Cervera [Fri, 4 Apr 2014 16:25:45 +0000 (16:25 +0000)]
am
07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
* commit '
07aac5e346c3fed31254e34d386c6236f1ac3f22':
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
Baligh Uddin [Fri, 4 Apr 2014 14:30:55 +0000 (14:30 +0000)]
am
b2856041: (-s ours) am
81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b285604185de1ade346eadb78971712607f54058':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:30:52 +0000 (14:30 +0000)]
am
15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
15fdce9d65b47e2b92bcac78776cc01486cff61a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:28:01 +0000 (14:28 +0000)]
am
81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
81e62eb1e576388866779e6f29d71614892dcf8a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:25:46 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Fri, 4 Apr 2014 14:22:51 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:45 +0000 (02:21 +0000)]
am
ef5caff8: am
c0086ba5: am
9bcfee1d: (-s ours) am
30e59135: am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
ef5caff8b53f3b8ce85277824f14936047bc11d5':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:42 +0000 (02:21 +0000)]
am
e18ae130: am
0bb7ec7e: am
d8b890da: (-s ours) am
af60289e: am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
e18ae1303c070759bce117b969186f699baa8564':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:39 +0000 (02:21 +0000)]
am
eca9620e: am
0c44762f: am
8152502e: (-s ours) am
07d5f94e: am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
eca9620e331d72afa933252dc7adb1ae3ed4d692':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:35 +0000 (02:21 +0000)]
am
f1973ae2: am
a1cca5cb: am
29b4986e: (-s ours) am
5c77c126: am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
f1973ae2107b2202cc7a2436ef1cf941cbfd9ff6':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:32 +0000 (02:21 +0000)]
am
74ad989d: am
77596103: am
ce393373: (-s ours) am
ef9f3043: am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
74ad989de6e5d62791edf15ebdbe45194cba3530':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:21:29 +0000 (02:21 +0000)]
am
14dee803: am
c7fdfe6b: am
99939cce: (-s ours) am
6094daa2: am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
14dee803f8a3b532e86613bb18d5cb572d113df9':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:14:12 +0000 (02:14 +0000)]
am
c0086ba5: am
9bcfee1d: (-s ours) am
30e59135: am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
c0086ba57f3bba1f9139baf72ed38f79f3e4ac02':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:14:10 +0000 (02:14 +0000)]
am
0bb7ec7e: am
d8b890da: (-s ours) am
af60289e: am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
0bb7ec7ef9523a8e87878251ae0a0502b66e3706':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:14:07 +0000 (02:14 +0000)]
am
0c44762f: am
8152502e: (-s ours) am
07d5f94e: am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
0c44762ffee58dbcd526ad173934e3ff48fb9ff9':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:14:04 +0000 (02:14 +0000)]
am
a1cca5cb: am
29b4986e: (-s ours) am
5c77c126: am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
a1cca5cb0b7ad982983aebac980c4a44827e7eb3':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:14:01 +0000 (02:14 +0000)]
am
77596103: am
ce393373: (-s ours) am
ef9f3043: am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
77596103b82939887901b04c9a46fab746ad63a7':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:13:59 +0000 (02:13 +0000)]
am
c7fdfe6b: am
99939cce: (-s ours) am
6094daa2: am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
c7fdfe6b67d81a62d79912780b585673043148ab':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:45 +0000 (02:07 +0000)]
am
9bcfee1d: (-s ours) am
30e59135: am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
9bcfee1d3ebe9704937e6935ffe7eabd46ebbf08':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:42 +0000 (02:07 +0000)]
am
d8b890da: (-s ours) am
af60289e: am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
d8b890da785e386f08e0a3cf6b7094a23af3c8f2':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:39 +0000 (02:07 +0000)]
am
8152502e: (-s ours) am
07d5f94e: am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
8152502e93edfe2f50d678d6860d3c7d1a8b4865':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:36 +0000 (02:07 +0000)]
am
29b4986e: (-s ours) am
5c77c126: am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
29b4986ecce1592bd2fe62024bb187dded33c0af':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:32 +0000 (02:07 +0000)]
am
ce393373: (-s ours) am
ef9f3043: am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
ce393373b73e1a1f30ce9bb41568d415cab7df49':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:28 +0000 (02:07 +0000)]
am
99939cce: (-s ours) am
6094daa2: am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
99939cce702b6b5a01be351f1a0b406a16509103':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:58 +0000 (02:01 +0000)]
am
30e59135: am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
30e59135b11d196cac2edd97d1ccca3471f3e398':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:55 +0000 (02:01 +0000)]
am
af60289e: am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
af60289e692b6b598d550371cc6e41e0b40dd6cd':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:51 +0000 (02:01 +0000)]
am
07d5f94e: am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
07d5f94e6b8a6d3f9caca057830e5cbd4cfa7dac':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:48 +0000 (02:01 +0000)]
am
5c77c126: am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
5c77c126b258924961a4a9c784177b4bcd403dd0':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:45 +0000 (02:01 +0000)]
am
ef9f3043: am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
ef9f3043f5259fa55376a1522152779295e15da6':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:42 +0000 (02:01 +0000)]
am
6094daa2: am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
6094daa2626e57c6bd24409f0934090581541e49':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:13 +0000 (01:54 +0000)]
am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
c07a48bed2c772dc548423396b208331b22a679a':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:10 +0000 (01:54 +0000)]
am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
70dfe865013f0c8fedf2c9468360a41b02fcce0a':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:08 +0000 (01:54 +0000)]
am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
2eb5f9e5b25dc769e5ba205237097c67fa212fd6':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:05 +0000 (01:54 +0000)]
am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
b6588c522451f5015c2cbc902d5a72566f979f2b':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:03 +0000 (01:54 +0000)]
am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
3bc5b23f8dbb6ecc4eeac4334f94682056d0cb3b':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:00 +0000 (01:54 +0000)]
am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
ba0ce05688ff7ebf91e16f5cb741701feb706fc2':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Ricardo Cervera [Fri, 4 Apr 2014 01:04:41 +0000 (18:04 -0700)]
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
Change-Id: Ibf718f6051aabaf1120d4245ffc870fa928138be
Deepanshu Gupta [Fri, 4 Apr 2014 00:45:44 +0000 (00:45 +0000)]
Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:45:29 +0000 (00:45 +0000)]
Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:45:13 +0000 (00:45 +0000)]
Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:44:01 +0000 (00:44 +0000)]
Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:43:47 +0000 (00:43 +0000)]
Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 4 Apr 2014 00:43:08 +0000 (00:43 +0000)]
Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
Xavier Ducrohet [Thu, 3 Apr 2014 22:17:10 +0000 (22:17 +0000)]
am
d93b0b67: am
e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev
* commit '
d93b0b67754f6d06407086278298f44156458216':
Add missing dependency in layoutlib build file [DO NOT MERGE]
Xavier Ducrohet [Thu, 3 Apr 2014 22:10:38 +0000 (22:10 +0000)]
am
e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev
* commit '
e448bcf71adec7b94e2a67ed06d0a725b80c31d8':
Add missing dependency in layoutlib build file [DO NOT MERGE]
Xavier Ducrohet [Thu, 3 Apr 2014 22:05:25 +0000 (22:05 +0000)]
Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev
Jeff Brown [Thu, 3 Apr 2014 03:20:01 +0000 (03:20 +0000)]
Merge "Clean up certain state transitions in DreamService." into klp-modular-dev
Jeff Brown [Thu, 3 Apr 2014 03:00:36 +0000 (20:00 -0700)]
Clean up certain state transitions in DreamService.
Instead of posting onDreamingStarted() to a handler from attach(), do
the work immediately. This ensures that the dream is actually in the
expected state when the callback runs. Previously it was possible
for the callback to run after detach() occurred which could cause
exceptions and unexpected behavior. As it happens, there's no need
to post this callback since attach() already runs on the UI thread.
Handle certain races involving the window token lifecycle a little
better. When the dream manager shuts down a dream, it removes the
window token. This can happen before the dream completes its attach()
phase in which case a BadTokenException is thrown. We now handle this
exception and abort the dream in anticipation of receiving a request
to finish it immediately.
Add a safeguard to getDozeHardware() to handle the case where it
might inadvertently be called at the wrong point in the lifecycle.
Bug:
13475612
Bug:
13760290
Change-Id: I9bc9c154370d08d7727b568d398c460a38592099
Jeff Tinker [Thu, 3 Apr 2014 01:30:42 +0000 (01:30 +0000)]
Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
Jinsuk Kim [Thu, 3 Apr 2014 00:35:09 +0000 (00:35 +0000)]
Merge "Use build property for CEC device OSD name" into klp-modular-dev
Jeff Tinker [Wed, 2 Apr 2014 19:23:56 +0000 (12:23 -0700)]
Add signature|system permission to MediaDrm signer APIs
Also addresses style issues noted in post-submit review from
https://googleplex-android-review.git.corp.google.com/#/c/439054/
Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5
related-to-bug:
12702350
Jinsuk Kim [Wed, 2 Apr 2014 23:12:09 +0000 (23:12 +0000)]
Merge "Fix build breakage by updating current.txt" into klp-modular-dev
Katie McCormick [Wed, 2 Apr 2014 23:11:20 +0000 (23:11 +0000)]
am
cd536cb3: am
0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
* commit '
cd536cb32927d74ac8181c8636f2971cb39e7fda':
docs: MediaRouteProvider Developer Guide
Jinsuk Kim [Wed, 2 Apr 2014 23:09:58 +0000 (08:09 +0900)]
Fix build breakage by updating current.txt
Change-Id: If9434850c24c8e97bdd49952fb3180d139cab101
Katie McCormick [Wed, 2 Apr 2014 23:05:04 +0000 (23:05 +0000)]
am
0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
* commit '
0cdf60472be5efc1b6e8ef125f96ba014870b345':
docs: MediaRouteProvider Developer Guide
Jinsuk Kim [Fri, 28 Mar 2014 02:46:04 +0000 (11:46 +0900)]
Use build property for CEC device OSD name
Previously OSD name was based on device type. This CL makes it
independent of device type. CEC spec says "A device that implements
more than one type of CEC functionality should respond with the same
OSD name for each logical address. It is recommended that the name
refers to the complete physical product rather than the individual
CEC functionality".
Now the default name comes from system build property. I removed
setOsdName() from aidl for now since it won't be in use.
Change-Id: I3c9fb877fad4bc5efef56268d155a3f37a865fc2
Katie McCormick [Wed, 2 Apr 2014 22:58:56 +0000 (22:58 +0000)]
Merge "docs: MediaRouteProvider Developer Guide" into klp-docs
Jinsuk Kim [Wed, 2 Apr 2014 22:39:41 +0000 (22:39 +0000)]
Merge "Maintain display power status for playback device" into klp-modular-dev
Joe Fernandez [Thu, 27 Mar 2014 06:11:31 +0000 (23:11 -0700)]
docs: MediaRouteProvider Developer Guide
Change-Id: I04e63a8972e29d67af6035462fd2808a562ac241
Michael Wright [Wed, 2 Apr 2014 20:26:36 +0000 (20:26 +0000)]
Merge "Misc. buttons aren't gamepad keys." into klp-modular-dev
Baligh Uddin [Wed, 2 Apr 2014 15:49:36 +0000 (08:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iedc52a08baa64f6294add074ebf597d09c06725a
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Apr 2014 15:41:45 +0000 (08:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3ba9a4dc3048b098598e12a78e7cc7dde521ea56
Auto-generated-cl: translation import
Jinsuk Kim [Mon, 24 Mar 2014 09:02:29 +0000 (18:02 +0900)]
Maintain display power status for playback device
With this CL, the power status of TV/display is keep tracked of
by hdmi cec server part, specfically HdmiCecDevicePlayback.
Turned the HdmiCecDevice to abstract class from which classes of
concrete device type(HdmiCecDevicePlayback, HdmiCecDeviceTV) are
inherited. The display power status code is put in HdmiCecDevicePlayback
only. HdmiCecDeviceTv will have its own logic that manages power status of
devices connected to it. For now it only has a bare minimum code.
Will be worked on in follow up CLs.
Other changes:
- Replaced sendGiveDevicePowerStatus() with isTvOn() so that the status
can be queried by clients.
- Defensively check the availability of HdmiCecService so that
HdmiCecManager.getClient() returns null in case the service couldn't
be initialized. This ensures clients of the service gets the nulled-out
HdmiCecClient when called in the state/configuration where the service
is not available, thus proceed accordingly.
Change-Id: Idaf69e73cfbd639c0b40b1bd4b6146f011246180
Ricardo Cervera [Wed, 2 Apr 2014 00:15:31 +0000 (00:15 +0000)]
am
5a218b18: am
8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
* commit '
5a218b186735534925d7fedb63f1c78a3a3ff543':
docs: Added notes to use the last SDK version to the Build your First App class.
Ricardo Cervera [Wed, 2 Apr 2014 00:08:11 +0000 (00:08 +0000)]
am
8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
* commit '
8e183798d573ad4777a5f01fd6db8f86ca0e120f':
docs: Added notes to use the last SDK version to the Build your First App class.
Ricardo Cervera [Wed, 2 Apr 2014 00:03:00 +0000 (00:03 +0000)]
Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs
Michael Kolb [Tue, 1 Apr 2014 22:48:27 +0000 (22:48 +0000)]
Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev
Michael Wright [Tue, 1 Apr 2014 22:43:43 +0000 (15:43 -0700)]
Misc. buttons aren't gamepad keys.
BUTTON_[1-9] are intended to be misc. buttons so the kernel will
assign them to non-gamepad devices. As such, we shouldn't treat them
as belonging to gamepads at all.
Bug:
13432364
Change-Id: I9495760f2379e44785b9ce1cf018b6db7f6cb0f4
Michael Kolb [Wed, 26 Mar 2014 23:24:17 +0000 (16:24 -0700)]
Add circular anti-aliasing mask to circular display
Bug:
13635645
Add a 2 px wide anti-aliased circle as a Layer to WindowManagerService
Change-Id: Ic8d319ca43c222f5b2e69af896749b8f2018ce3e
Jeff Tinker [Tue, 1 Apr 2014 21:54:29 +0000 (21:54 +0000)]
Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
Craig Mautner [Tue, 1 Apr 2014 21:48:04 +0000 (21:48 +0000)]
am
c70f15fe: am
2fc798a2: resolved conflicts for merge of
8c6e6e73 to klp-dev
* commit '
c70f15fe298655de02c2e72023fafe6fc33d2a55':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 21:41:15 +0000 (21:41 +0000)]
am
2fc798a2: resolved conflicts for merge of
8c6e6e73 to klp-dev
* commit '
2fc798a2270cda98366776af489d45c1043e831d':
Fix FLAG_DISMISS_KEYGUARD not working
Jeff Tinker [Tue, 4 Mar 2014 21:17:11 +0000 (13:17 -0800)]
Support CAST V2 Authentication in MediaDrm
Java API version
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a
related-to-bug:
12702350
Craig Mautner [Tue, 1 Apr 2014 20:57:37 +0000 (13:57 -0700)]
resolved conflicts for merge of
8c6e6e73 to klp-dev
Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
Michael Kolb [Tue, 1 Apr 2014 20:40:34 +0000 (20:40 +0000)]
Merge "Add outset to decor view measuring" into klp-modular-dev
Craig Mautner [Tue, 1 Apr 2014 20:01:32 +0000 (20:01 +0000)]
am
13b75939: am
d4d2aa51: am
efbe7cc0: am
d1c82f8f: am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
13b75939596eec63c096fe9e85643b8c42a40b12':
Fix FLAG_DISMISS_KEYGUARD not working
Craig Mautner [Tue, 1 Apr 2014 19:54:59 +0000 (19:54 +0000)]
am
d4d2aa51: am
efbe7cc0: am
d1c82f8f: am
1cb3c1d3: am
fc80fbe3: am
7bd0b652: am
4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working
* commit '
d4d2aa519fb1a9d54c14da858a4ab7ab0880f34d':
Fix FLAG_DISMISS_KEYGUARD not working