OSDN Git Service
Joe Fernandez [Fri, 24 Oct 2014 09:27:02 +0000 (09:27 +0000)]
am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '
0e893eb7ac1985a02d61525a5e6076d45a1e8c7d':
docs:Added 64-bit image note from Preview page
Natalie Masse [Fri, 24 Oct 2014 08:13:36 +0000 (08:13 +0000)]
am
1e5bb861: Link and typo fixed
* commit '
1e5bb861265072b9af555d09202e49cb38a3c4f1':
Link and typo fixed
Joe Fernandez [Fri, 24 Oct 2014 06:06:00 +0000 (06:06 +0000)]
Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
Natalie Masse [Fri, 17 Oct 2014 12:44:39 +0000 (13:44 +0100)]
Link and typo fixed
Change-Id: Ie9ace6e002703d7d1f83173da49672cf60ca1653
Scott Rowe [Thu, 16 Oct 2014 17:01:04 +0000 (17:01 +0000)]
am
ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
* commit '
ab64919c0e683dcd0f32f95f580f0d95ce29476d':
docs: update reference to FragmentRetainInstance
Scott Rowe [Thu, 16 Oct 2014 16:56:54 +0000 (16:56 +0000)]
Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
Joe Fernandez [Thu, 16 Oct 2014 14:39:16 +0000 (14:39 +0000)]
am
58c64870: Merge "Typo fixed in sample code" into klp-modular-docs
* commit '
58c64870a8f3505d032ec7c5ac0fc4faba08347a':
Typo fixed in sample code
Joe Fernandez [Thu, 16 Oct 2014 14:34:46 +0000 (14:34 +0000)]
Merge "Typo fixed in sample code" into klp-modular-docs
Prashant Malani [Wed, 15 Oct 2014 17:02:00 +0000 (17:02 +0000)]
Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev
Ricardo Cervera [Wed, 15 Oct 2014 15:50:42 +0000 (15:50 +0000)]
am
8a7ba4c6: Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs
* commit '
8a7ba4c681d16aab194e1c4ab7b7bfcce5012d17':
docs: Fixing notify link. Bug:
17571861
Ricardo Cervera [Wed, 15 Oct 2014 15:47:30 +0000 (15:47 +0000)]
Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs
Luan Nguyen [Wed, 15 Oct 2014 15:17:40 +0000 (15:17 +0000)]
am
2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs
* commit '
2a364235d27245d999bb1d6e7621c0d6a0e89ef0':
docs: Android Wear Design fixes
Luan Nguyen [Wed, 15 Oct 2014 15:12:23 +0000 (15:12 +0000)]
Merge "docs: Android Wear Design fixes" into klp-modular-docs
smain@google.com [Wed, 15 Oct 2014 03:36:11 +0000 (03:36 +0000)]
am
075531ae: add the butterbar for L announce to Preview landing page
* commit '
075531ae190dd6e64d3a53991a209a624cb0ec63':
add the butterbar for L announce to Preview landing page
smain@google.com [Wed, 15 Oct 2014 02:34:43 +0000 (19:34 -0700)]
add the butterbar for L announce to Preview landing page
Change-Id: Id84a5a62153281b3daaefc287450d392ecb51bbc
smain@google.com [Wed, 15 Oct 2014 02:15:35 +0000 (02:15 +0000)]
am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906
* commit '
d8d20f52ec0550477b773cee4c0f0343f2a9301f':
update analytics event tracking calls to use new script bug:
16331906
smain@google.com [Wed, 8 Oct 2014 23:53:42 +0000 (16:53 -0700)]
update analytics event tracking calls to use new script
bug:
16331906
Change-Id: I4cd8f08509cfb887a424696553404ba3c635151b
Craig Mautner [Tue, 22 Jul 2014 18:08:53 +0000 (11:08 -0700)]
DO NOT MERGE Add empty ArrayList check.
Fixes bug
15768779.
Fixes bug
17955259.
Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 22:20:02 +0000 (22:20 +0000)]
am
7668aa27: am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
* commit '
7668aa27999e5650fe8776853565f792311fb57d':
Revert "docs: Watermarked images for codes that weren't found."
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 22:14:16 +0000 (22:14 +0000)]
am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs
* commit '
aa7bcf140d95049f1482c896b770de7ba339f7c9':
Revert "docs: Watermarked images for codes that weren't found."
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 21:59:47 +0000 (21:59 +0000)]
Merge "Revert "docs: Watermarked images for codes that weren't found."" into klp-docs
Ricardo Cervera-Navarro [Tue, 14 Oct 2014 15:49:07 +0000 (15:49 +0000)]
Revert "docs: Watermarked images for codes that weren't found."
Remove easter eggs.
This reverts commit
453df8e6e33f30808ea2244eaa1dd32169996129.
Change-Id: Iaa8c815a876d163c35cc83f3cf4899dd426def7b
Rich Slogar [Fri, 10 Oct 2014 21:23:51 +0000 (21:23 +0000)]
am
a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs
* commit '
a3287768e267f71fbce5d3341b6db8f3a9e04230':
docs:SDK tools 23.0.5 Release Note
Rich Slogar [Fri, 10 Oct 2014 21:19:07 +0000 (21:19 +0000)]
Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs
Eric Gilmore [Fri, 10 Oct 2014 20:49:54 +0000 (20:49 +0000)]
am
e77fe607: Docs: adding closing bracket to un-break javadoc tokens.
* commit '
e77fe607609e5a6ea59e11164e21744623cf07a5':
Docs: adding closing bracket to un-break javadoc tokens.
Rich Slogar [Fri, 10 Oct 2014 18:03:23 +0000 (11:03 -0700)]
docs:SDK tools 23.0.5 Release Note
Change-Id: Ib26f100247d3b8b6f0447251a35fa427393c9938
Eric Gilmore [Tue, 7 Oct 2014 19:48:48 +0000 (12:48 -0700)]
Docs: adding closing bracket to un-break javadoc tokens.
Bug:
17186958
Change-Id: Ib21120d71ccd7c59536af3d26d7090fc919bec17
Joe Fernandez [Thu, 9 Oct 2014 12:01:36 +0000 (12:01 +0000)]
am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
* commit '
e15773be4837baf15079d5d7e8f8c0c09cef952f':
docs: Android TV publishing requirements
Joe Fernandez [Thu, 9 Oct 2014 04:19:19 +0000 (04:19 +0000)]
Merge "docs: Android TV publishing requirements" into klp-modular-docs
Joe Fernandez [Mon, 6 Oct 2014 05:12:10 +0000 (22:12 -0700)]
docs: Android TV publishing requirements
Change-Id: If1105cb596934034a7156b573c99905bbe6c4978
Fred Fettinger [Fri, 29 Aug 2014 19:02:31 +0000 (14:02 -0500)]
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
Cherry-picked into klp-modular-dev.
bug:
17441218
GLConsumer uses glBindTexture() directly instead of going through
Caches::bindTexture(). This can cause libhwui to draw with the wrong
texture bound in the following case which involves 2 TextureViews:
Frame 1:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
Frame 2:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 2)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
HWUI renders TextureView B:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 2) and draws
In this case, HWUI will incorrectly draw TextureView A using texture 2 on
frame 2, because mBoundTextures[0]=1, even though the texture currently
bound to GL_TEXTURE_EXTERNAL_OES is 2.
Since GLConsumer is always used with a target of GL_TEXTURE_EXTERNAL_OES,
work around this problem by having mBoundTextures[] store only the
textures bound to the target GL_TEXTURE_2D. This is the common case
where the extra performance is needed. Since it's legal to have
different textures bound to GL_TEXTURE_2D and GL_TEXTURE_EXTERNAL_OES
on one texture unit, Caches::bindTexture() does not need to clear
mBoundTextures[mTextureUnit] when target != GL_TEXTURE_2D.
Change-Id: I8bc54ab8adcfacad7f3ed17a31236dc7a86c967a
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
(cherry picked from commit
e4de36bbc2baf13206deb53ced39f0befadb1861)
smain@google.com [Thu, 9 Oct 2014 00:04:57 +0000 (00:04 +0000)]
am
770c3c5e: fix unclickable link due to overlay from offset dev below
* commit '
770c3c5ed52f354fe04ced31aaa56ba57a028955':
fix unclickable link due to overlay from offset dev below
smain@google.com [Wed, 8 Oct 2014 23:54:21 +0000 (16:54 -0700)]
fix unclickable link due to overlay from offset dev below
Change-Id: I59bedd0e928d578a3bd030caa4add4cfa96db83f
Quddus Chong [Wed, 8 Oct 2014 18:01:05 +0000 (18:01 +0000)]
am
7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
* commit '
7f567e4a1c561f60c6d31f6709508f5ec5a6ba88':
docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
Quddus Chong [Wed, 8 Oct 2014 17:50:44 +0000 (10:50 -0700)]
docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
Change-Id: I710c0eab6913988d8bc70ded344a2d60fa594d92
Deepanshu Gupta [Wed, 8 Oct 2014 01:36:57 +0000 (18:36 -0700)]
Exclude KXmlParser from LayoutLib.
The class was incorrectly being included in the LayoutLib.
Change-Id: I3c86662efa068019fe9165f2fc49a00d0a1b7f2d
Natalie Masse [Wed, 8 Oct 2014 15:49:13 +0000 (16:49 +0100)]
Typo fixed in sample code
Change-Id: I15328b663db3cffa44b5fb5c1fa4becd7a7d9f2d
Joe Fernandez [Wed, 8 Oct 2014 14:45:59 +0000 (14:45 +0000)]
am
bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
* commit '
bcd1af39fa674dcc46ddb30778304eaf67100a13':
docs: Wear UI Lib training fixes
Joe Fernandez [Wed, 8 Oct 2014 14:37:34 +0000 (14:37 +0000)]
Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
Deepanshu Gupta [Sat, 2 Aug 2014 20:16:24 +0000 (13:16 -0700)]
LayoutLib: Use ICU's line break algo. [DO NOT MERGE]
Change-Id: I7e5b0ab7423a72f5a4b0e1163d0a537f0b03ba07
(cherry picked from commit
760f6394d0f65fbb5365186e8e068d53c506b653)
Rich Slogar [Wed, 8 Oct 2014 00:34:38 +0000 (00:34 +0000)]
am
6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs
* commit '
6af8fc7f89cb5dec15c23ee04c271188ff11138d':
docs:64 bit image and skd update
Rich Slogar [Wed, 8 Oct 2014 00:31:42 +0000 (00:31 +0000)]
Merge "docs:64 bit image and skd update" into klp-modular-docs
Quddus Chong [Tue, 7 Oct 2014 23:33:10 +0000 (23:33 +0000)]
am
8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
* commit '
8730092af798d27b9e9a9a4ba00cef0d3ebea55f':
docs: Added API highlights for Google Play services 6.1 (Manchego).
Quddus Chong [Tue, 7 Oct 2014 23:33:03 +0000 (23:33 +0000)]
am
6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
* commit '
6628e602fb616355db8272a697a7004d91f485b8':
Updataed Google Play services Javadocs for v6.1 (Manchego) release.
Quddus Chong [Tue, 7 Oct 2014 23:27:01 +0000 (23:27 +0000)]
Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
Quddus Chong [Tue, 7 Oct 2014 23:26:48 +0000 (23:26 +0000)]
Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
Rich Slogar [Tue, 7 Oct 2014 18:06:07 +0000 (11:06 -0700)]
docs:64 bit image and skd update
Change-Id: I53d3d8e8714cb4689ba80766b155fb1b3ea93484
Ricardo Cervera [Tue, 7 Oct 2014 18:38:24 +0000 (18:38 +0000)]
am
bd964cad: docs: Removing references to self note on Common Intents page.
* commit '
bd964cadd4846d5d954eadb7fcd2a61e51814c65':
docs: Removing references to self note on Common Intents page.
Ricardo Cervera [Tue, 7 Oct 2014 17:37:19 +0000 (10:37 -0700)]
docs: Removing references to self note on Common Intents page.
Change-Id: Ia1324f2363ce66ad0019946605a6a74a4cd28ecc
Ricardo Cervera [Tue, 7 Oct 2014 04:49:17 +0000 (04:49 +0000)]
am
3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
* commit '
3f7b4d8ff385ce30c6c266f8b0418fc621db2da8':
docs: Update Common Intents page with Google Now actions
Ricardo Cervera [Tue, 7 Oct 2014 04:41:12 +0000 (04:41 +0000)]
Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
Ricardo Cervera [Tue, 30 Sep 2014 16:55:48 +0000 (09:55 -0700)]
docs: Update Common Intents page with Google Now actions
Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
Luan Nguyen [Wed, 1 Oct 2014 20:20:43 +0000 (13:20 -0700)]
docs: Android Wear Design fixes
Change-Id: I258705082e32eb5633907bdf2ea5b4a5e4be69cb
Quddus Chong [Sat, 4 Oct 2014 01:30:43 +0000 (01:30 +0000)]
am
ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
* commit '
ba2199fa8c369d9627a216a4c3ea19497bf9e9c7':
docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
Quddus Chong [Sat, 4 Oct 2014 01:20:12 +0000 (01:20 +0000)]
Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
Ricardo Cervera [Sat, 4 Oct 2014 00:01:21 +0000 (00:01 +0000)]
am
2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
* commit '
2a02b8813bd6bfd3d36cca6e5e3a3ff6a868d881':
docs: Training class for the Wearable UI Library
Rich Slogar [Sat, 4 Oct 2014 00:01:17 +0000 (00:01 +0000)]
am
83d5c9bf: docs:change required ADT version to 23.0.2
* commit '
83d5c9bfbd75831375009e21989de40368afc04a':
docs:change required ADT version to 23.0.2
Ricardo Cervera [Fri, 3 Oct 2014 23:43:25 +0000 (16:43 -0700)]
docs: Wear UI Lib training fixes
Change-Id: I8d4610b68218455b8a00a34a101cee1f0d945633
Ricardo Cervera [Fri, 3 Oct 2014 23:25:23 +0000 (23:25 +0000)]
Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
smain@google.com [Fri, 3 Oct 2014 22:13:14 +0000 (22:13 +0000)]
am
cef9aab6: Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs
* commit '
cef9aab68ec45340186261d39ded6261ba1c5966':
make sdk download links use HTTPS bug:
8033954
Rich Slogar [Fri, 3 Oct 2014 22:12:17 +0000 (15:12 -0700)]
docs:change required ADT version to 23.0.2
Change-Id: I6312cd45df94a89f2812aa3c53e2974f6cfbb0ed
smain@google.com [Fri, 3 Oct 2014 22:06:43 +0000 (22:06 +0000)]
Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs
Quddus Chong [Thu, 11 Sep 2014 23:50:09 +0000 (16:50 -0700)]
docs: Modified the notice in the android.location package file to strongly
encourage developers to migrate to the Google Play Services Location API.
Change-Id: I9c2602daa7198eca38841582865c6a973f5acec8
Ricardo Cervera [Fri, 3 Oct 2014 18:00:37 +0000 (18:00 +0000)]
am
d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
* commit '
d37afa37452d5e5dab3704ecab0ab7cebb3da292':
docs: Unbuntu troubleshooting link to CamelCase ID
Ricardo Cervera [Fri, 3 Oct 2014 17:55:34 +0000 (17:55 +0000)]
Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
Ricardo Cervera [Fri, 3 Oct 2014 16:44:25 +0000 (09:44 -0700)]
docs: Unbuntu troubleshooting link to CamelCase ID
Change-Id: I705d17346c470563c350df9bb17d23f3fda5fbc5
Rich Slogar [Thu, 2 Oct 2014 22:47:15 +0000 (22:47 +0000)]
am
c470faab: docs:ADT 23.0.4 doc updates
* commit '
c470faab3ee47b5643ee6b0a97c925c8f0f587fa':
docs:ADT 23.0.4 doc updates
Rich Slogar [Thu, 2 Oct 2014 22:13:09 +0000 (15:13 -0700)]
docs:ADT 23.0.4 doc updates
Change-Id: Ibf412802e7c98ed3beff6c61394f1b3962254d9a
Ricardo Cervera [Fri, 26 Sep 2014 20:00:34 +0000 (13:00 -0700)]
docs: Training class for the Wearable UI Library
Change-Id: I93e9f6fc407f9afa79ce9af43d90719eb526bffa
Joe Fernandez [Thu, 2 Oct 2014 21:14:59 +0000 (21:14 +0000)]
am
e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
* commit '
e961d0b521bc25caf964258e75fef3d3ea22e4ac':
Revert "docs: Update for Android 23.0.4"
Joe Fernandez [Thu, 2 Oct 2014 21:08:27 +0000 (21:08 +0000)]
Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
Joe Fernandez [Thu, 2 Oct 2014 21:07:49 +0000 (21:07 +0000)]
Revert "docs: Update for Android 23.0.4"
This reverts commit
f34d0e69033165b7a6e9c73b99f4ef6ac36b3896.
Change-Id: I4d521392733f1b028c72d4623d6d69a4c5910bc4
Rich Slogar [Thu, 2 Oct 2014 17:53:27 +0000 (10:53 -0700)]
docs:Added 64-bit image note from Preview page
Change-Id: I7c092d009522ff73454cd6412cbd89ee47466e3f
Ricardo Cervera [Thu, 2 Oct 2014 20:40:23 +0000 (13:40 -0700)]
docs: Fixing notify link. Bug:
17571861
Change-Id: I15cd80d29c177d04414d125a902d94b7e44d78ca
Ricardo Cervera [Thu, 2 Oct 2014 18:07:53 +0000 (18:07 +0000)]
am
680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
* commit '
680092c5987e701043ff0fa0d2c5390e829412c0':
docs: Provide direct link to Ubuntu troubleshooting.
Ricardo Cervera [Thu, 2 Oct 2014 18:04:41 +0000 (18:04 +0000)]
Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs
Ricardo Cervera [Thu, 2 Oct 2014 01:32:42 +0000 (18:32 -0700)]
docs: Provide direct link to Ubuntu troubleshooting.
Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
Rich Slogar [Thu, 2 Oct 2014 17:38:35 +0000 (17:38 +0000)]
am
c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs
* commit '
c074c3a4074791ae1270e3177e2299f31b9bb5a1':
docs: Update for Android 23.0.4
Rich Slogar [Thu, 2 Oct 2014 17:31:04 +0000 (17:31 +0000)]
Merge "docs: Update for Android 23.0.4" into klp-modular-docs
Rich Slogar [Wed, 1 Oct 2014 18:37:18 +0000 (11:37 -0700)]
docs: Update for Android 23.0.4
Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf
Deepanshu Gupta [Thu, 2 Oct 2014 03:32:27 +0000 (03:32 +0000)]
Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:48 +0000 (03:26 +0000)]
Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:43 +0000 (03:26 +0000)]
Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:37 +0000 (03:26 +0000)]
Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:31 +0000 (03:26 +0000)]
Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:21 +0000 (03:26 +0000)]
Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:04 +0000 (03:26 +0000)]
Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:26:02 +0000 (03:26 +0000)]
Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:42 +0000 (03:25 +0000)]
Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:36 +0000 (03:25 +0000)]
Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 2 Oct 2014 03:25:31 +0000 (03:25 +0000)]
Merge "Add tests to the layoutlib eclipse project. [DO NOT MERGE]" into klp-modular-dev
Jeff Hao [Fri, 28 Mar 2014 18:33:53 +0000 (11:33 -0700)]
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
Needed to bypass new access checks for fields, methods, and
constructors.
Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
(cherry picked from commit
e3abd2ccbef4c50b48df3605c65d732fa49a980b)
Deepanshu Gupta [Fri, 19 Sep 2014 21:29:02 +0000 (14:29 -0700)]
Resource resolution bug fix. [DO NOT MERGE]
Fix a bug where "?attr/foo" in framework resources wasn't resolved
properly.
Change-Id: I9a56974f526774fde79685f668f01021136d68f1
(cherry picked from commit
19c7842082d831ad432abe906f4c37c6ed08e414)
Deepanshu Gupta [Fri, 19 Sep 2014 18:48:58 +0000 (11:48 -0700)]
Fix Tests after cherry picks. [DO NOT MERGE]
1. Updated the intelliJ run configuration for the layoutlib_create tool.
2. Updated the code to search for the platform.dir.
3. Update tests to use AppTheme and Target SDK 19
Change-Id: I6f1cc6ff2a53e4474c746537029c7f89c6dd6dc1
(cherry picked from commit
8592eeafd01370d1a17e34602290becf7f611c75)
Deepanshu Gupta [Wed, 13 Aug 2014 19:30:40 +0000 (12:30 -0700)]
Update intelliJ copyright profile [DO NOT MERGE]
Change-Id: Ib9386b686cb24e1f187d0b636b59b4b13d59bbcd
(cherry picked from commit
91fa62ac67a5e294124b5bfb70b35addc7687c34)
Deepanshu Gupta [Tue, 9 Sep 2014 01:38:57 +0000 (18:38 -0700)]
Build layoutlib create tests as part of sdk build. [DO NOT MERGE]
LayoutLib Create tests are now built whenever LayoutLib create is built.
Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
(cherry picked from commit
4efe6264f1251fa200427f54ea6f5dd4c4d03665)
Deepanshu Gupta [Fri, 5 Sep 2014 02:07:40 +0000 (19:07 -0700)]
Add layoutlib tests to DIST_DIR [DO NOT MERGE]
Add the layoutlib and layoutlib-create tests to DIST_DIR for sdk
targets. These can be used for continuous testing on the build server.
Change-Id: I747dddcddfd8009937668bec4d75cb99bf63235f
(cherry picked from commit
f9c749c9901c459f77ffc6f4fbbc15f4142c6e0a)
Deepanshu Gupta [Wed, 3 Sep 2014 19:57:12 +0000 (12:57 -0700)]
Build layoutlib_create tests. [DO NOT MERGE]
Change-Id: Ia13a090f8ec29b2b2a107825b6a13d7db77e6d61
(cherry picked from commit
2294f939bc79ce902a40db37def64cc28394d56b)
Deepanshu Gupta [Mon, 25 Aug 2014 18:49:02 +0000 (11:49 -0700)]
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
The variable is not actually needed and it makes working with different
API levels a lot easier since everything now depends on $PROJECT_DIR$.
This change also makes the tests more robust by improving the way it
tries to find the SDK.
Change-Id: I3502ad4a0ba85fd88b497e47964fddb2a89e520c
(cherry picked from commit
5377695d4ecf3cc6dc1abe59bbfca63f6137b722)
Deepanshu Gupta [Mon, 4 Aug 2014 21:01:07 +0000 (14:01 -0700)]
Get filename from File faster [DO NOT MERGE]
Use the direct call from a File object to get the filename instead of
going through Path which depends on Java 7 making the LayoutLib tests
incompatible with Java 6.
Change-Id: I815895eedbc10245ee09bdb53b11e5548b076aad
(cherry picked from commit
7dbf91fee96790fbeb9858740be1bb375f29ecb5)
OSDN Git Service
