OSDN Git Service

android-x86/frameworks-base.git
8 years agoam 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they...
Paul Jensen [Wed, 23 Sep 2015 11:13:48 +0000 (11:13 +0000)]
am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce...
Paul Jensen [Wed, 23 Sep 2015 11:13:40 +0000 (11:13 +0000)]
am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit '635f871132449bea7489f6a61276979beeee5591':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoam ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have...
Paul Jensen [Wed, 23 Sep 2015 11:06:32 +0000 (11:06 +0000)]
am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev

* commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258':
  Don't mark NetworkRequests restricted when they don't have restricted caps

8 years agoam a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 11:06:27 +0000 (11:06 +0000)]
am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.

8 years agoMerge "Don't mark NetworkRequests restricted when they don't have restricted caps...
Paul Jensen [Wed, 23 Sep 2015 10:59:31 +0000 (10:59 +0000)]
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev

8 years agoMerge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
Paul Jensen [Wed, 23 Sep 2015 10:58:57 +0000 (10:58 +0000)]
Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev

8 years agoam b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT...
Zach Jang [Mon, 21 Sep 2015 18:58:27 +0000 (18:58 +0000)]
am b2b3cecb: am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'b2b3cecbd3de80d40f8c207c6aa94532c3426829':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security...
Zach Jang [Mon, 21 Sep 2015 18:58:18 +0000 (18:58 +0000)]
am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '0a8197b1e43bc3771fc3f8595619603ec8f6f641':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoresolved conflicts for 521def98 to lmp-mr1-dev
Zach Riggle [Thu, 17 Sep 2015 21:34:08 +0000 (17:34 -0400)]
resolved conflicts for 521def98 to lmp-mr1-dev

8 years agoam 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport...
Zach Jang [Thu, 17 Sep 2015 20:44:41 +0000 (20:44 +0000)]
am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165...
Zach Jang [Thu, 17 Sep 2015 20:32:53 +0000 (20:32 +0000)]
am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'fe4cbf2b1b135b327018915a512a8e6293a96017':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security...
Zach Jang [Thu, 17 Sep 2015 20:24:00 +0000 (20:24 +0000)]
am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'cff4e09e26e3b976aa0273df78e89f592fc6d287':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level...
Zach Jang [Thu, 17 Sep 2015 20:09:55 +0000 (20:09 +0000)]
am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit 'bdf7f3583c637f370e97e74526df14b9c70e6493':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoam 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level...
Zach Jang [Thu, 17 Sep 2015 20:04:23 +0000 (20:04 +0000)]
am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

* commit '1cf21e443aaf207b962f50169be28c0babe71f61':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings

8 years agoDO NOT MERGE - Backport of ag/748165 to klp-dev
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d

8 years agoDO NOT MERGE - Backport of ag/748165 to klp-dev
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d

8 years agoMerge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""...
Zach Jang [Wed, 16 Sep 2015 01:40:18 +0000 (01:40 +0000)]
Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

8 years agoRevert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
Zach Jang [Wed, 16 Sep 2015 01:38:41 +0000 (01:38 +0000)]
Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""

This reverts commit 3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.

Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d

8 years agoMerge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp...
Zach Jang [Wed, 16 Sep 2015 01:37:36 +0000 (01:37 +0000)]
Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

8 years agoRevert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Zach Jang [Tue, 15 Sep 2015 20:09:52 +0000 (20:09 +0000)]
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f

8 years agoam 4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Sat, 12 Sep 2015 06:29:09 +0000 (06:29 +0000)]
am 4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

* commit '4c330c6ae53df48f6486b6f047021b204fc66594':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

8 years agoLayoutLib: Fix typedArray caching.
Deepanshu Gupta [Wed, 26 Aug 2015 18:54:50 +0000 (11:54 -0700)]
LayoutLib: Fix typedArray caching.

The typedArray depends on the current context (more specifically, the
themes set on the context). The fact was ignored in the caching of the
typedArray and caused the android:theme attribute to be ignored in
certain cases.

Change-Id: If095580919474f12c0eb4e1f8fb7f076cf3c4ed0

8 years agoMerge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into...
Bart Sears [Mon, 31 Aug 2015 21:53:46 +0000 (21:53 +0000)]
Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev

8 years ago[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Tao Bao [Sat, 29 Aug 2015 00:46:20 +0000 (17:46 -0700)]
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d

8 years agoDO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.

Bug: 23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584

8 years agoDO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.

If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.

Bug: 23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584

8 years agoDon't mark NetworkRequests restricted when they don't have restricted caps
Paul Jensen [Fri, 28 Aug 2015 16:00:15 +0000 (12:00 -0400)]
Don't mark NetworkRequests restricted when they don't have restricted caps

Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted.  Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.

Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
(cherry picked from commit aae613d96134245af7c55976731a49fa59e77470)

8 years agoFix NOT_RESTRICTED network capability and enforce it.
Paul Jensen [Fri, 28 Aug 2015 15:58:50 +0000 (11:58 -0400)]
Fix NOT_RESTRICTED network capability and enforce it.

With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit 487ffe7d3d84bf65212158f7098e8a84b5b55e09)

8 years agoLayoutLib: Update golden test images. [DO NOT MERGE]
Deepanshu Gupta [Tue, 25 Aug 2015 23:13:23 +0000 (16:13 -0700)]
LayoutLib: Update golden test images. [DO NOT MERGE]

Also update the generated classes from the MyApplication test project.

Change-Id: I97bce3737c0cb528a61fa652988a2edb09ec885d

8 years agoAn ugly hack to render CalendarView. [DO NOT MERGE]
Deepanshu Gupta [Tue, 25 Aug 2015 23:06:57 +0000 (16:06 -0700)]
An ugly hack to render CalendarView. [DO NOT MERGE]

This is an ugly hack to switch the field
android.widget.SimpleMonthView.mDayFormatter from
java.text.SimpleDateFormat to icu's version of the same class. The hack
is only for the L version of the LayoutLib. It's done in a better way in
M and even better in N.

Change-Id: Id84a1d32040211c46b20cdaf3a77119676e748b6

8 years agoLayoutLib: Fix true transparency in status bar. [DO NOT MERGE]
Deepanshu Gupta [Sat, 22 Aug 2015 00:23:50 +0000 (17:23 -0700)]
LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]

Change-Id: Ieedf23cde9ab3e36c77501d30cc7e808e66a4782
(cherry picked from commit f9662c006c650c9f61f19a5e1ea4a76640eb85ca)

8 years agoMake getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]
Deepanshu Gupta [Tue, 4 Aug 2015 18:57:10 +0000 (11:57 -0700)]
Make getInt in BridgeTypedArray accept empty String. [DO NOT MERGE]

The XML editor already warns about the empty strings in places where an
int value is required. There's no need to show another warning for it in
the rendering panel. Also, the rendering might have also failed when the
empty string is encountered. Try an continue the rendering, because no
rendering state is really bad.

Change-Id: I85106f37e4462f237e85f0b065b4ce8a4bfabf4d
(cherry picked from commit 0437cac76c24dc6cac7b530e6d80f789565550ec)

8 years agoFix layout mirroring. [DO NOT MERGE]
Deepanshu Gupta [Tue, 4 Aug 2015 18:56:44 +0000 (11:56 -0700)]
Fix layout mirroring. [DO NOT MERGE]

Change-Id: I7db398aa2d11dac1210e84922138f78f0c23bb9b
(cherry picked from commit a9090705efcc44f015486944e5aeb926173a7968)

8 years agoFix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 31 Jul 2015 20:10:18 +0000 (13:10 -0700)]
Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]

Change-Id: Ia8d223ae01f08df945ab05615b07075b98a54a32
(cherry picked from commit 5a8f33f1b09b0311f1bbd1ec6b90db706edb5219)

8 years agoFix Matrix_Delegate.native_getValues() [DO NOT MERGE]
Deepanshu Gupta [Mon, 3 Aug 2015 17:23:56 +0000 (10:23 -0700)]
Fix Matrix_Delegate.native_getValues() [DO NOT MERGE]

The bug manifested itself by not rendering the wifi icon in the status
bar.

Change-Id: I7debf3eef387965d774bf66e856812e67c8552a7
(cherry picked from commit 9f280a9301566c94a583cc45b6abea8a4488e33c)

8 years agoRevert to using AppTheme for LayoutLib tests. [DO NOT MERGE]
Deepanshu Gupta [Mon, 3 Aug 2015 18:25:45 +0000 (11:25 -0700)]
Revert to using AppTheme for LayoutLib tests. [DO NOT MERGE]

Use AppTheme for all tests other than testExpand. AppTheme contains an
attribute needed by testArrayCheck. Also, since the AppTheme extends
Theme.Material.Light.DarkActionBar, other tests should be unaffected.

Also, update the golden image for the testArrayCheck.

Change-Id: Ib5f53f3b029c5aceef2b622e5ac63952d6b1972a
(cherry picked from commit 89a045c31f4f08bc0d9d533ef47f321e6423f656)

8 years agoFix imports. [DO NOT MERGE]
Deepanshu Gupta [Mon, 27 Jul 2015 17:11:03 +0000 (10:11 -0700)]
Fix imports. [DO NOT MERGE]

Also remove null checks on return value of ReflectionUtils.getMethod()
as the method always return non null.

Change-Id: Ib476302c2cf0504a0f54db4e795955ad10e5df3f
(cherry picked from commit 671b7f9b99316f7224c1213d6923d449a2de9b62)

8 years agoFix theme namespace in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 29 Jul 2015 18:12:44 +0000 (11:12 -0700)]
Fix theme namespace in tests. [DO NOT MERGE]

The tests used framework theme (Material), but the ResourceResolver was
created with project theme. This caused tests to fail becasue of missing
resources.

Change-Id: Ia17ee19054f6689f85e3423e83c1f47a2cc4364f
(cherry picked from commit 4a6ee98d39ab2300b2cd17c60221e43bf4ade8e7)

8 years agoRun setup for full tests only once. [DO NOT MERGE]
Deepanshu Gupta [Sat, 9 May 2015 20:33:55 +0000 (13:33 -0700)]
Run setup for full tests only once. [DO NOT MERGE]

Change-Id: Iee64dbd88d473b7be08581f26ccddf649aed8e56
(cherry picked from commit a12ec8f1e28cb5a8601bf606852f1d34d7c91996)

8 years agoLayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]
Deepanshu Gupta [Wed, 29 Jul 2015 01:27:28 +0000 (18:27 -0700)]
LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]

Change-Id: I0d3ee6fd5a4656156a630d3b298533ea13eb8415
(cherry picked from commit 6e8d8ad2b7cffed751b2a382ac7b761954767188)

8 years agoLayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]
Deepanshu Gupta [Mon, 27 Jul 2015 18:50:43 +0000 (11:50 -0700)]
LayoutLib: Fix Status/Navigation Bar color. [DO NOT MERGE]

If the color value for status bar or navigation bar is declared directly
in the theme (i.e. doesn't reference a color resource via @color/foo),
the ResourceType for the attribute is not assigned by the IDE. LayoutLib
used to ignore resources that were not of type color. This change fixes
the issue by also checking the resources without a type.

Change-Id: I94735ec225415282db06ab9db5c3233ad89c052f
(cherry picked from commit e3f9834ebd8a6e4ee155c8e4c9456dfc98e8b832)

8 years agoSet support flag for custom layouts for RecyclerView. [DO NOT MERGE]
Deepanshu Gupta [Thu, 23 Jul 2015 23:40:23 +0000 (16:40 -0700)]
Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]

Change-Id: I3a0349c0482ae45e226b2016a0f24707c85edff4
(cherry picked from commit f7712d3524309c365b68f93497771084e6b5a66b)

8 years agoLayoutLib: translucent sys ui bars [DO NOT MERGE]
Deepanshu Gupta [Thu, 23 Jul 2015 18:35:25 +0000 (11:35 -0700)]
LayoutLib: translucent sys ui bars [DO NOT MERGE]

Change-Id: I9c294329fc78418c505a5115bc9c07da29595af2
(cherry picked from commit fc8f4aad7395eca11f6d9b82eb266b1f4ee5041b)

8 years agoUpdate nav bar icons. [DO NOT MERGE]
Deepanshu Gupta [Wed, 13 May 2015 23:56:42 +0000 (16:56 -0700)]
Update nav bar icons. [DO NOT MERGE]

- Add a script to copy the icons from the original source.
- Update layout used for the navigation bar to be closer to the original
  layout.
- Update test image with the latest rendering.
- Add a nexus 5 landscape device config to help with testing.

Change-Id: I0b6674955e0970a6a8cce148b1b7aa61e1752ccd
(cherry picked from commit 139d6ff12d395a888624113fdd2521861b47d761)

8 years agoMove the layout code out of RenderSessionImpl. [DO NOT MERGE]
Deepanshu Gupta [Wed, 22 Jul 2015 01:27:40 +0000 (18:27 -0700)]
Move the layout code out of RenderSessionImpl. [DO NOT MERGE]

Also, switch to using a RelativeLayout from a LinearLayout. The change
will help in future when enabling transparent status and nav bar.

Change-Id: Ie4db5d28313f1c5ef775603788598a56409f92c7
(cherry picked from commit b1484862e2367d87d3ccbd0fd0a6d2598ed5918a)

8 years agoCalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]
Deepanshu Gupta [Fri, 17 Jul 2015 01:32:54 +0000 (18:32 -0700)]
CalendarView rendering: use R.styleable to find attr. [DO NOT MERGE]

Not all attr are added to R.attr. This results in some attr not being
found and hence a broken rendering. Fix the issue by adding all attr
referenced in R.styleable to the map of attr before adding any remaining
values from R.attr.

Change-Id: I1ebf8a394b9e1edbf7490e011833d20a00d38317
(cherry picked from commit e8018480dbefc896bd26e5eedfdde802ce3731a7)

8 years agoAdd tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]
Deepanshu Gupta [Sat, 11 Jul 2015 00:38:29 +0000 (17:38 -0700)]
Add tools:openDrawer to open a DrawerLayout. [DO NOT MERGE]

Store a list of drawer layouts with tools:openDrawer encountered and
call openDrawer on them during the post-inflation processing.

Change-Id: Idee299a9af1bb106509a03bb2e8424c372b93dc5
(cherry picked from commit ccbc11770397888cf7780925bb4c7cf1d2f2f80e)

8 years agoChange tools:list_item to listitem. [DO NOT MERGE]
Deepanshu Gupta [Wed, 8 Jul 2015 19:47:46 +0000 (12:47 -0700)]
Change tools:list_item to listitem. [DO NOT MERGE]

The listitem is already in use for ListView. Reuse the same attribute
for RecyclerView rather than creating a new one.

Change-Id: I82aabe7d04fbe3e61645bc427a81c14c454d03c5
(cherry picked from commit 111dc04a28f0181bf429e5ded9024d3fdff7be50)

8 years agoImplement tools:list_item for RecyclerView. [DO NOT MERGE]
Deepanshu Gupta [Tue, 7 Jul 2015 01:31:20 +0000 (18:31 -0700)]
Implement tools:list_item for RecyclerView. [DO NOT MERGE]

It's now possible to use tools:list_item attribute for RecyclerView to
point to a default layout, rather than always using a TextView.

Change-Id: I5d522b2f0ca38b420fddfcb0f73a26d95707da79
(cherry picked from commit 61f23e9bf7d784e7a52168196758c4f6c6853e77)

8 years agoSupport AppBar from Material Design. [DO NOT MERGE]
Jens Ole Lauridsen [Fri, 5 Jun 2015 15:04:27 +0000 (08:04 -0700)]
Support AppBar from Material Design. [DO NOT MERGE]

This CL is a start for making the design able to render the AppBar.
We are still missing support for: system menu and the app icon.

Change-Id: I19600f8ee1e7e6492186a0b7ae7fb38c82e15c02
(cherry picked from commit 4dfe4d43ce5634f059a3ba669e3cac4551c3a3ee)

8 years agoUpdate tests per new layoutlib_api [DO NOT MERGE]
Deepanshu Gupta [Tue, 7 Jul 2015 01:26:41 +0000 (18:26 -0700)]
Update tests per new layoutlib_api [DO NOT MERGE]

Change-Id: Idc89ffceaf171abcf2b579f4e934b514ef209210
(cherry picked from commit d7b846c1814de34f2cea8507907f70618ec7cae0)

8 years agoAdd missing resolveResValue call. [DO NOT MERGE]
Deepanshu Gupta [Tue, 30 Jun 2015 21:28:58 +0000 (14:28 -0700)]
Add missing resolveResValue call. [DO NOT MERGE]

Bug: http://b.android.com/178504
Change-Id: I7dde8094cf762893e4f7ea0d3de87a281c9602cd
(cherry picked from commit 5d1eaf4a197130f561b16c4ed083cf016b20ab92)

8 years agoLayoutLib: Skip classes from java package. [DO NOT MERGE]
Deepanshu Gupta [Mon, 1 Jun 2015 21:21:24 +0000 (14:21 -0700)]
LayoutLib: Skip classes from java package. [DO NOT MERGE]

Classes in "java" package can't be defined at runtime anyway. No use
including them in LayoutLib.

Change-Id: I7e7c46f0d74e32c893b23093828569b4fa5e3a73
(cherry picked from commit 86caef1892e1ce063e0e880396c8deaa3a6a171d)

8 years agoSkip warnings for some unresolved references. [DO NOT MERGE]
Deepanshu Gupta [Wed, 27 May 2015 19:35:56 +0000 (12:35 -0700)]
Skip warnings for some unresolved references. [DO NOT MERGE]

Some applications rename the newer RTL attributes to the older
attributes in order to target RTL locales, but not need to include two
attributes everywhere it's needed. For example, iosched renames
paddingStart to paddingLeft (among other attributes) for API 17 and
above. This leads to hundreds of warnings about missing attributes.
This change suppresses such warnings.

Also, skip adding unresolved attributes to the typed array. This is more
in line with the actual implementation on device, and prevents
unexpected warnings/errors/crashes later.

Change-Id: Iee616fa6295aa9731ede0cf9dcd6dd2bd1fe8f20
(cherry picked from commit b3e872be9e634c8d1f34d07778ea753880bbf2d9)

8 years agoFix import order. [DO NOT MERGE]
Deepanshu Gupta [Fri, 13 Mar 2015 22:24:59 +0000 (15:24 -0700)]
Fix import order. [DO NOT MERGE]

Change-Id: I50bfbf4011290683a1c6adb94e0b6fa301dcc75b
(cherry picked from commit b9b8aef94e5bad8f5f03f686a2d3d8a09c045a7b)

8 years agoFix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Sat, 30 May 2015 00:00:34 +0000 (17:00 -0700)]
Fix ParserFactory not initialized error. [DO NOT MERGE]

Bug: http://b.android.com/175129
Change-Id: I2111673767e0f62ee910560022b559a177d55abd
(cherry picked from commit 996458b76c944f78eee26d7bd8cb4d39303b9119)

8 years agoFix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Thu, 28 May 2015 19:33:04 +0000 (12:33 -0700)]
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]

Replace direct member access with getter that checks for nullness.

Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586
(cherry picked from commit d758e042ce08c46712db3db2d63fc84795028dfe)

8 years agoFix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Wed, 27 May 2015 23:57:10 +0000 (16:57 -0700)]
Fix BridgeTypedArray.getType() [DO NOT MERGE]

Also includes some fixes for BridgeTypedArray.getInt() - when value is a
color, when value is an octal int, when value is true/false.

Bug: http://b.android.com/162438
Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6
(cherry picked from commit 5779ad71eabed3aabaefef1e4749693f8320816e)

8 years agoInclude Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 26 May 2015 16:24:48 +0000 (09:24 -0700)]
Include Shapes in LayoutLib. [DO NOT MERGE]

Change-Id: Ifb32882c478f8d407ad904e224b67fe2bd65dc08
(cherry picked from commit 59164ec0551aa49f497acca81222f304cf4f344b)

8 years agoLayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Fri, 22 May 2015 22:47:16 +0000 (15:47 -0700)]
LayoutLib: Support getting resource arrays. [DO NOT MERGE]

- Don't crash when Resources.get<Type>Array() is called.
- If the IDE supports it, actually return the value.
- Add tests for getArray.
- Update test app to latest gradle plugin version.
- Switch to using AppTheme for tests, since the tests depend on some
  custom theme attributes. The AppTheme now inherits from
  Material.Light.DarkActionBar, so other tests should be unaffected.

Depends on a newer version of sdk-common, which fixes the parsing of
array resource in value files.

Bug: 12372031
Change-Id: I313b61511e98ac1402d75056ebfdeeb005ebb96d
(cherry picked from commit 642cff50f8f7a67eed09eac1e56d7133b26a192c)

8 years agoLayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Fri, 22 May 2015 21:11:22 +0000 (14:11 -0700)]
LayoutLib: Change nullity annotations. [DO NOT MERGE]

Switch from using tools nullity annotations (com.android.annotations)
to android framework annotations (android.annotation).

A new sdk-common prebuilt is required for LayoutLib tests. The new
sdk-common requires an updated tools-common. The updated tools-common
doesn't have nullity annotations. So, instead of adding the annotation
dependency, just reuse the platform ones. This also paves the way to
include other platform annotations like IdRes etc.

Change-Id: I87b8f767d3681d914abe7d1329e26a87f49f50a7
(cherry picked from commit 476e582d2ffdf25102d4c55f8c242baa3d21d37f)

8 years agoAdd documentation about hack in commit: f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Thu, 21 May 2015 18:47:36 +0000 (11:47 -0700)]
Add documentation about hack in commit: f8ea750455 [DO NOT MERGE]

Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
(cherry picked from commit 6330971ed293a2777bbdab09288f90ea4b2d0255)

8 years agoMake DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Mon, 24 Aug 2015 20:50:18 +0000 (13:50 -0700)]
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]

Only cherry picked for the style not found fix.

Change-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9
(cherry picked from commit d5b82845450beac2d3c7db9cd80e9fc34d43a297)

8 years agoInject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Wed, 20 May 2015 21:51:37 +0000 (14:51 -0700)]
Inject anonymous inner classes of injected classes [DO NOT MERGE]

When injecting classes in LayoutLib (eg. CreateInfo), so that LayoutLib
can refer back to the changes, also inject the anonymous inner classes.
Without this, the injected classes are not loadable. Although, LayoutLib
itself doesn't load these classes, but some tests do.

Change-Id: Ib5f6b779ef4d79dec8d614d3dbb26eeac88a1064
(cherry picked from commit bfc9c3bcbe3b7056d3330f754811c1506f181b88)

8 years agoUpdate platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 20 May 2015 18:28:50 +0000 (11:28 -0700)]
Update platformDir search in tests. [DO NOT MERGE]

When trying to find the SDK Platform Dir for LayoutLib tests, also
test if the dir from which the tests are run is module dir.

Change-Id: Id5c6038d07ebbb122e38f907ad488ed1f2bcde32
(cherry picked from commit 612a05e7e15184b21437731b9aa5db2d1d4fc54c)

8 years agoMake Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Tue, 19 May 2015 01:47:07 +0000 (18:47 -0700)]
Make Context.getClassLoader() work. [DO NOT MERGE]

Context.getClassLoader() is used by the LayoutInflater and can be used
by custom views. However, when called from the LayoutInflater, this
needs to return only the Framework classes. This is so that the IDE gets
a chance to instantiate the custom views, which helps in better error
reporting and better fallback in case of exceptions, like MockView.

To workaround this need of the same method returning different results
based on where it's called from, the method call in LayoutInflater is
renamed to getFrameworkClassLoader() and the new method is injected in
Context. The implementation of getFrameworkClassLoader() maintains the
existing behaviour of getClassLoader().

Context.getClassLoader() is now modified to return classes from both
Framework and the app namespace.

Also, update the list of packages to search for Framework views.

Change-Id: I1a6be4aa1fc5c1c5520b5440a348a52f10b6eb3b
(cherry picked from commit f8ea750455eec81e4e6d877b3e18e29a86d4ec95)

8 years agoFix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Tue, 19 May 2015 18:55:15 +0000 (11:55 -0700)]
Fix include tag rendering. [DO NOT MERGE]

A missing catch clause caused rendering to be failed when there is an
include tag that doesn't specify layout_width and layout_height. Also
improve the error messages to make debugging easier next time.

Change-Id: I617762636973a010b34da167c7b5fcd328b7d178
(cherry picked from commit 21b564573327b1ed2f7e06146b8a01c47ede3089)

8 years agoShow better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Mon, 18 May 2015 21:39:03 +0000 (14:39 -0700)]
Show better error message for color attr not found. [DO NOT MERGE]

Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
(cherry picked from commit 5f1bf496948fb6383ae17e5467a26a00489d7564)

8 years agoFix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Fri, 15 May 2015 00:00:50 +0000 (17:00 -0700)]
Fix build: udpate parser factory method [DO NOT MERGE]

Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
(cherry picked from commit 3dc19883c571a829c36aa603c04a55c91b00dd57)

8 years agoDon't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Thu, 14 May 2015 22:37:29 +0000 (15:37 -0700)]
Don't keep LayoutlibCallback reference. [DO NOT MERGE]

Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.

 Conflicts:
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java

Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
(cherry picked from commit f2d408b51debadca830eefbf8131185ac55ce699)

8 years agoRemove kxml dependency [DO NOT MERGE]
Deepanshu Gupta [Sat, 9 May 2015 20:09:22 +0000 (13:09 -0700)]
Remove kxml dependency [DO NOT MERGE]

Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.

Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
(cherry picked from commit 78af25584633462e4ab8cf9bafe10f43e7cb2d83)

8 years agoam 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow...
Sebastien Hertz [Fri, 21 Aug 2015 10:37:46 +0000 (10:37 +0000)]
am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '599dc2bd1c809ae5a413fc3800fc3fbb71432de6':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only...
Sebastien Hertz [Fri, 21 Aug 2015 10:29:30 +0000 (10:29 +0000)]
am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '50af68e74a756d0fc81eda2a3580dbcf70362d42':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked...
Sebastien Hertz [Fri, 21 Aug 2015 10:18:38 +0000 (10:18 +0000)]
am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '55f86b1811f0411a5d685d6c97772b846a706e19':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT...
Sebastien Hertz [Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)]
am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 09:50:24 +0000 (09:50 +0000)]
am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '18089ceb71ad4ce2332096b8e7b5f8c1f8e263db':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote
Sebastien Hertz [Fri, 21 Aug 2015 07:08:43 +0000 (07:08 +0000)]
am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote

* commit '445ab7fa43f32ac1a256b15f5ab2bd619e9711e4':
  Allow debugging only for apps forked from zygote

8 years agoam ff8dc212: Allow debugging only for apps forked from zygote
Sebastien Hertz [Fri, 21 Aug 2015 07:01:02 +0000 (07:01 +0000)]
am ff8dc212: Allow debugging only for apps forked from zygote

* commit 'ff8dc21278b19b22ed8dc9f9475850838336d351':
  Allow debugging only for apps forked from zygote

8 years agoAllow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote DO NOT MERGE

When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)

Change-Id: I2400ecc8aea7579c43300efccf288b69f70eef53

8 years agoAllow debugging only for apps forked from zygote
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote

When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)

Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19

8 years agoam 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI
Adrian Roos [Thu, 23 Jul 2015 18:47:07 +0000 (18:47 +0000)]
am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI

* commit '7f63ef380ff8c95ea43edd832a7b986ad362e7cf':
  Prevent insanely long passwords from crashing SystemUI

8 years agoam 9b6a6099: Prevent insanely long passwords from crashing SystemUI
Adrian Roos [Thu, 23 Jul 2015 18:34:56 +0000 (18:34 +0000)]
am 9b6a6099: Prevent insanely long passwords from crashing SystemUI

* commit '9b6a60991453136819a6feeca404e1102e78f735':
  Prevent insanely long passwords from crashing SystemUI

8 years agoPrevent insanely long passwords from crashing SystemUI
Adrian Roos [Tue, 21 Jul 2015 20:27:22 +0000 (13:27 -0700)]
Prevent insanely long passwords from crashing SystemUI

Bug: 22214934
Change-Id: I32e238e53ac4b6dd0ae6de226b98894c495b256f

8 years agoMerge "Render to measured size when using expand mode" into lmp-mr1-dev
Diego Perez [Tue, 21 Jul 2015 12:56:50 +0000 (12:56 +0000)]
Merge "Render to measured size when using expand mode" into lmp-mr1-dev

9 years agoam 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent syste...
Wale Ogunwale [Thu, 2 Jul 2015 00:37:02 +0000 (00:37 +0000)]
am 7ab264ab: am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit '7ab264abc214b7e1b7fff9934814020cea5f18fa':
  Prevent system uid component from running in an app process

9 years agoam 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid compone...
Wale Ogunwale [Wed, 1 Jul 2015 17:17:23 +0000 (17:17 +0000)]
am 742bfa80: am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit '742bfa809cf2c022d690f84b4213e908ee66e8aa':
  Prevent system uid component from running in an app process

9 years agoam f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from runni...
Wale Ogunwale [Wed, 1 Jul 2015 17:03:02 +0000 (17:03 +0000)]
am f3dbb57e: am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit 'f3dbb57ee8fce4b7c2cad352ebe5096a880ae06b':
  Prevent system uid component from running in an app process

9 years agoam c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an...
Wale Ogunwale [Wed, 1 Jul 2015 16:39:11 +0000 (16:39 +0000)]
am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit 'c215b2b24575e6d7693f396c7fdfe675d5ea9d1c':
  Prevent system uid component from running in an app process

9 years agoam ec425a19: am df9948d8: Merge "Prevent system uid component from running in an...
Wale Ogunwale [Wed, 1 Jul 2015 16:35:21 +0000 (16:35 +0000)]
am ec425a19: am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev

* commit 'ec425a19f973e2511485b61424dffb9f3cafb542':
  Prevent system uid component from running in an app process

9 years agoMerge "Prevent system uid component from running in an app process" into lmp-mr1-dev
Wale Ogunwale [Wed, 1 Jul 2015 16:30:40 +0000 (16:30 +0000)]
Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev

9 years agoam df9948d8: Merge "Prevent system uid component from running in an app process"...
Wale Ogunwale [Wed, 1 Jul 2015 16:18:42 +0000 (16:18 +0000)]
am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev

* commit 'df9948d81232a03271113c16bee6f3ab6b826bad':
  Prevent system uid component from running in an app process

9 years agoam dc9cfca8: Merge "Prevent system uid component from running in an app process"...
Wale Ogunwale [Wed, 1 Jul 2015 16:18:17 +0000 (16:18 +0000)]
am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev

* commit 'dc9cfca80139714ca37122148d041beedbf0ceb2':
  Prevent system uid component from running in an app process

9 years agoMerge "Prevent system uid component from running in an app process" into lmp-dev
Wale Ogunwale [Wed, 1 Jul 2015 16:06:46 +0000 (16:06 +0000)]
Merge "Prevent system uid component from running in an app process" into lmp-dev

9 years agoMerge "Prevent system uid component from running in an app process" into klp-dev
Wale Ogunwale [Wed, 1 Jul 2015 16:06:32 +0000 (16:06 +0000)]
Merge "Prevent system uid component from running in an app process" into klp-dev

9 years agoam 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT...
Amit Mahajan [Tue, 30 Jun 2015 20:00:00 +0000 (20:00 +0000)]
am 22766e85: am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

* commit '22766e85d8b7bbedaa28a409f34120c4f3d4a2d3':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

9 years agoam 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens...
Joe Fernandez [Tue, 30 Jun 2015 19:59:53 +0000 (19:59 +0000)]
am 88c2d704: am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs

* commit '88c2d704c3bbb58a676b4b1164b1c98aecdf467d':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.

9 years agoam bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change...
Amit Mahajan [Tue, 30 Jun 2015 19:45:08 +0000 (19:45 +0000)]
am bcf9223b: am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

* commit 'bcf9223b3bbe542d0ab040398c26cf1c600f5493':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

9 years agoam 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used...
Joe Fernandez [Tue, 30 Jun 2015 19:45:03 +0000 (19:45 +0000)]
am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs

* commit '4bd25634f13876e7ab31b6de66ceb9ca1cdc784d':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.

9 years agoam 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMI...
Amit Mahajan [Tue, 30 Jun 2015 18:21:50 +0000 (18:21 +0000)]
am 23444e76: (-s ours) am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

* commit '23444e76d2480d2537c2b6418f0c6c89c8cdb590':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

9 years agoam 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly...
Joe Fernandez [Tue, 30 Jun 2015 18:21:41 +0000 (18:21 +0000)]
am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs

* commit '765255b41229553842da855b8e5d9dfa87cf8e2b':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.