OSDN Git Service
Adam Powell [Fri, 4 Apr 2014 19:23:42 +0000 (12:23 -0700)]
Fix ActionBar attribute parsing
Lost in some prior refactoring. Also fixes doc builds for the removed
styleable.
Change-Id: Ice27a978cd5c22c6ad1fc0b45557c6cac77b5985
Adam Powell [Fri, 4 Apr 2014 17:49:53 +0000 (17:49 +0000)]
Merge "android.widget.Toolbar"
Adam Powell [Fri, 4 Apr 2014 17:47:41 +0000 (17:47 +0000)]
Merge "Deprecate ActionBar navigation modes"
Ricardo Cervera [Fri, 4 Apr 2014 17:46:28 +0000 (17:46 +0000)]
am
1ac6519b: am
c31bd52d: am
a821af68: am
715139a6: Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
* commit '
1ac6519b245c008ea6b3b6baba205fb58d75c807':
docs: Fixed action bar example. Bug:
13806963
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
Winson Chung [Fri, 4 Apr 2014 17:38:01 +0000 (17:38 +0000)]
Merge "Fixing error in calculating translation animation."
Winson Chung [Fri, 4 Apr 2014 17:37:18 +0000 (10:37 -0700)]
Fixing error in calculating translation animation.
Change-Id: Idd029051619f152a59653e8fb445d028f5e8672e
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:23:08 +0000 (17:23 +0000)]
Merge "docs: Fixed action bar example. Bug:
13806963" into klp-docs
Winson Chung [Fri, 4 Apr 2014 17:22:07 +0000 (17:22 +0000)]
Merge "Fixing crash when filtering tasks too quickly."
Winson Chung [Fri, 4 Apr 2014 01:05:29 +0000 (18:05 -0700)]
Fixing crash when filtering tasks too quickly.
- Using a translation-based animation duration scheme
- Fixing issue where filtering a task could slide it out of view
Change-Id: Id434b4a98aa671d84d047dad18cbe26f543cdf25
Ricardo Cervera [Fri, 4 Apr 2014 17:14:16 +0000 (17:14 +0000)]
am
c6d4a464: am
13d49e9f: am
e2bdd6ae: am
6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug:
13671312" into klp-docs
* commit '
c6d4a4647074e7d9f4882e54637567103108c0e3':
docs: Updated the link to buy a Nexus phone. Bug:
13671312
Adam Powell [Tue, 18 Mar 2014 02:10:43 +0000 (19:10 -0700)]
android.widget.Toolbar
Add the new Toolbar widget for use in app layouts.
ActionBar can now be used as a point of control for either a
traditional window decor action bar or for a Toolbar that appears
inline in an Activity's layout.
ToolbarActionBar is currently WIP.
Change-Id: I0da093e5645840f4fd032aa34efa0ae5f1825ff2
Adam Powell [Tue, 18 Mar 2014 00:44:59 +0000 (17:44 -0700)]
Deprecate ActionBar navigation modes
Navigation modes were a great shortcut for patterns that are no longer
recommended or that don't integrate as nicely with application
content. Apps have done a great job both inventing new navigation
patterns that work well in their own contexts or following patterns
that can be implemented inline with an app's content. Navigation modes
as a prescriptive construct are no longer needed.
Be free, apps!
Change-Id: I9ae1c2efc830c7dcb6664061bba68b1748928ae3
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:42:49 +0000 (16:42 +0000)]
am
957428dc: am
8866eb81: am
c23ab90c: am
07aac5e3: docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
* commit '
957428dcc55456077b28f2ff3190ec39844e6eee':
docs: Moved small section in Build your project with Gradle doc. Bug:
13767801
Andres Morales [Fri, 4 Apr 2014 16:42:37 +0000 (16:42 +0000)]
Merge "Add calls for NFC WSC token creation"
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
Glenn Kasten [Fri, 4 Apr 2014 15:31:09 +0000 (15:31 +0000)]
Merge "Simplify and document AudioTrack gain"
Baligh Uddin [Fri, 4 Apr 2014 14:44:42 +0000 (14:44 +0000)]
am
69660170: (-s ours) am
87210ee9: (-s ours) am
b2856041: (-s ours) am
81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
696601704ecfc23d9f8e4e184b2a78c049add6d7':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:44:39 +0000 (14:44 +0000)]
am
c71d89a8: (-s ours) am
ab0c43a4: (-s ours) am
15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
c71d89a8268cdc445b1b07e9f5a97372f8593629':
Import translations. DO NOT MERGE
Adam Connors [Fri, 4 Apr 2014 14:40:20 +0000 (14:40 +0000)]
Merge "Add android.software.managedprofiles feature flag."
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:25:46 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 4 Apr 2014 14:23:00 +0000 (14:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 4 Apr 2014 14:22:53 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 4 Apr 2014 14:22:51 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Paul Lawrence [Fri, 4 Apr 2014 14:05:55 +0000 (14:05 +0000)]
Merge "Save OwnerInfo so CryptKeeper can display at boot time"
Deepanshu Gupta [Fri, 4 Apr 2014 03:20:01 +0000 (03:20 +0000)]
am
e0628134: (-s ours) 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 '
e0628134ab8c5f997d43cc6d8ed79fdea5e815f6':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 03:19:57 +0000 (03:19 +0000)]
am
37f28f22: (-s ours) 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 '
37f28f22e2c2816c63ccd316432f768401177f9e':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 03:19:54 +0000 (03:19 +0000)]
am
adcd4ee2: (-s ours) 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 '
adcd4ee2e42b126d66cc793dcd6e44e049156e30':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 03:19:51 +0000 (03:19 +0000)]
am
8b38cd7f: (-s ours) 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 '
8b38cd7ff63bcd38266b4fdb26ca993e3090b5dd':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 03:19:48 +0000 (03:19 +0000)]
am
f3603fe9: (-s ours) 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 '
f3603fe93a6a3b2002384415fbd555dd3cd2e538':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 03:19:45 +0000 (03:19 +0000)]
am
c6ef5428: (-s ours) 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 '
c6ef5428cf3ced10645f5bab7bc3b99ba5ec191a':
Fix text size in Fake Action Bar. [DO NOT MERGE]
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]
Craig Mautner [Fri, 4 Apr 2014 01:57:47 +0000 (01:57 +0000)]
Merge "Fix build due to bad javadoc link."
Craig Mautner [Fri, 4 Apr 2014 01:54:52 +0000 (18:54 -0700)]
Fix build due to bad javadoc link.
Change-Id: I83ca32611fb72b79be271dc3a5bd848934e9174f
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
Jeff Tinker [Fri, 4 Apr 2014 00:30:27 +0000 (00:30 +0000)]
Merge "resolved conflicts for merge of
4f342e87 to master"
Christopher Tate [Thu, 3 Apr 2014 23:14:51 +0000 (16:14 -0700)]
Significant preconditions are significant
If you are going to check whether we've failed yet, make sure that
the default state to test against has been established properly.
Bug
13790971
Change-Id: I7fc6ff1bbbd9e569df59dcb65cc30f120c128efa
Xavier Ducrohet [Thu, 3 Apr 2014 22:30:44 +0000 (22:30 +0000)]
am
72b2f536: (-s ours) am
76c484de: am
d93b0b67: am
e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev
* commit '
72b2f536908f0f3249c59c630f1a06af371b2bfa':
Add missing dependency in layoutlib build file [DO NOT MERGE]
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
Winson Chung [Thu, 3 Apr 2014 21:07:56 +0000 (21:07 +0000)]
Merge "Adding activity icon to the task view"
Craig Mautner [Thu, 3 Apr 2014 20:51:21 +0000 (20:51 +0000)]
Merge "Add the persistable attribute for Activities"
OSDN Git Service
