OSDN Git Service
Nick Kralevich [Fri, 4 Apr 2014 23:31:44 +0000 (23:31 +0000)]
am
4ed27328: am
dc97144b: Merge "Always call super.onCreate(). Always."
* commit '
4ed27328b5e20d32b1e6ac5b39684dad3e737ca7':
Always call super.onCreate(). Always.
Nick Kralevich [Fri, 4 Apr 2014 23:25:52 +0000 (23:25 +0000)]
am
dc97144b: Merge "Always call super.onCreate(). Always."
* commit '
dc97144b3f83bf6dae90493a6631afc6523dfce2':
Always call super.onCreate(). Always.
Nick Kralevich [Fri, 4 Apr 2014 23:18:45 +0000 (23:18 +0000)]
Merge "Always call super.onCreate(). Always."
Christopher Tate [Wed, 12 Feb 2014 21:14:10 +0000 (13:14 -0800)]
Always call super.onCreate(). Always.
Bug
12991134
(cherrypick of commit
9d6376a1d88ab5b3a41ee4400e3aaa4c4ee69e2a)
Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
Katie McCormick [Fri, 4 Apr 2014 21:35:50 +0000 (21:35 +0000)]
am
8e63696a: am
f7bffe77: am
fc8ea92d: Merge "Doc Update: notification bug fix." into klp-docs
* commit '
8e63696a73dfebae9b2ec123611db6b21968dbfd':
Doc Update: notification bug fix.
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:28:09 +0000 (19:28 +0000)]
am
5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '
5c31e487c4577e1c47ee7c949325d6a13f0d462e':
Introduce new UI_MODE_TYPE_WATCH and qualifier.
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:48:51 +0000 (17:48 +0000)]
am
d10b6543: am
5df82523: am
ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug:
13716053" into klp-docs
* commit '
d10b65431547d66b41e4e282e9261453bb0658ff':
docs: Added permissions note for Context.getFilesDir. Bug:
13716053
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:39:39 +0000 (17:39 +0000)]
am
c31bd52d: am
a821af68: am
715139a6: Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
* commit '
c31bd52df22dabf52b50e1377878548607d1f07b':
docs: Fixed action bar example. Bug:
13806963
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:07:43 +0000 (17:07 +0000)]
am
13d49e9f: am
e2bdd6ae: am
6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
* commit '
13d49e9f364965169f933bcad6bcaeeb2f29fade':
docs: Updated the link to buy a Nexus phone. Bug:
13671312
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:36:32 +0000 (16:36 +0000)]
am
8866eb81: am
c23ab90c: am
07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
* commit '
8866eb8155a40559c4ee0927764aa4c32e9a9cd2':
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
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:37:25 +0000 (14:37 +0000)]
am
87210ee9: (-s ours) am
b2856041: (-s ours) am
81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
87210ee9621829786516f52fc45dfeabd5daec0a':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:37:23 +0000 (14:37 +0000)]
am
ab0c43a4: (-s ours) am
15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
ab0c43a4581d5b34ea9590cad4495447aa536942':
Import translations. DO NOT MERGE
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:26:40 +0000 (02:26 +0000)]
am
53ccdf18: 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 '
53ccdf1894f64ea53e2dd57477c783c82b81e537':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:26:38 +0000 (02:26 +0000)]
am
5f9887e6: 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 '
5f9887e6f1587dd9e761574727ca420f7d033cc4':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:26:35 +0000 (02:26 +0000)]
am
3e4aebdb: 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 '
3e4aebdbfcb4290e2c0afe7d0473516c52c96e85':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:26:33 +0000 (02:26 +0000)]
am
2deb31ff: 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 '
2deb31ffbe4ce6fc3552f35847b2e02a0d938f1e':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:26:30 +0000 (02:26 +0000)]
am
6acadebe: am
74ad989d: am
77596103: am
ce393373: (-s ours) am
ef9f3043: am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
6acadebe8b7a3e498900c9eeceef7e0395768690':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:26:27 +0000 (02:26 +0000)]
am
a5346647: 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 '
a53466479c0bfc29c9c05d245ae1870ff3baf09b':
Fix text size in Fake Action Bar. [DO NOT MERGE]
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:24:47 +0000 (22:24 +0000)]
am
76c484de: am
d93b0b67: am
e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev
* commit '
76c484de88317fbadc8a070fc333d4fb14355335':
Add missing dependency in layoutlib build file [DO NOT MERGE]
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
Raph Levien [Thu, 3 Apr 2014 16:02:39 +0000 (16:02 +0000)]
am
24a2f20f: am
c420ce34: Merge "Marquee text RTL improvements"
* commit '
24a2f20fe64e893e28dc70b288e12567ff71019f':
Marquee text RTL improvements
Raph Levien [Thu, 3 Apr 2014 15:55:22 +0000 (15:55 +0000)]
am
c420ce34: Merge "Marquee text RTL improvements"
* commit '
c420ce34ba177cd959cbb9432e9597d377e6cee6':
Marquee text RTL improvements
Raph Levien [Thu, 3 Apr 2014 15:50:28 +0000 (15:50 +0000)]
Merge "Marquee text RTL improvements"
Narayan Kamath [Thu, 3 Apr 2014 14:11:34 +0000 (14:11 +0000)]
am
f87b3a25: am
374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
* commit '
f87b3a25b928f145558f6f60183944f513878b63':
Remove ProcessState::mArgc,mArgV,mArgLen
Narayan Kamath [Thu, 3 Apr 2014 14:05:28 +0000 (14:05 +0000)]
am
374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
* commit '
374db6c3792e9ed56230e09fee4742632ce8159a':
Remove ProcessState::mArgc,mArgV,mArgLen
Narayan Kamath [Thu, 3 Apr 2014 13:59:37 +0000 (13:59 +0000)]
Merge "Remove ProcessState::mArgc,mArgV,mArgLen"
Narayan Kamath [Fri, 28 Mar 2014 13:39:21 +0000 (13:39 +0000)]
Remove ProcessState::mArgc,mArgV,mArgLen
These look like historical oddities, and weren't really being
used for anything useful.
Process:setArgV0 was being called by android.util.Process, but
that functionality can be moved directly into the implementation
of that class.
bug:
13647418
Change-Id: I216c8f8a4c065f0cf3a61f19f9e32decd26f93f6
Ben Murdoch [Thu, 3 Apr 2014 10:00:25 +0000 (10:00 +0000)]
am
14424043: am
369a0057: Merge "Update ViewRootImpl for 64bit functor type."
* commit '
14424043b9c20edf639004e05fe8e9264a2e66f5':
Update ViewRootImpl for 64bit functor type.
Ben Murdoch [Thu, 3 Apr 2014 09:54:33 +0000 (09:54 +0000)]
am
369a0057: Merge "Update ViewRootImpl for 64bit functor type."
* commit '
369a00574da218975718ce07ffe6abba5c17bf92':
Update ViewRootImpl for 64bit functor type.
Ben Murdoch [Thu, 3 Apr 2014 09:48:43 +0000 (09:48 +0000)]
Merge "Update ViewRootImpl for 64bit functor type."
Jeff Brown [Thu, 3 Apr 2014 03:25:02 +0000 (03:25 +0000)]
am
8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev
* commit '
8db6d9af58b9b81dbd764acd3f6a379afb539bf6':
Clean up certain state transitions in DreamService.
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:35:28 +0000 (01:35 +0000)]
am
4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
* commit '
4995d72520d16302fca13bc4614d1dd3c0d1c17c':
Add signature|system permission to MediaDrm signer APIs
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:39:23 +0000 (00:39 +0000)]
am
31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
* commit '
31518f745ffa5e832274c332ac957a065948fdaf':
Use build property for CEC device OSD name
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
OSDN Git Service
