160939 Commits

Author SHA1 Message Date
Paul Jensen
96cd7c14b5 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.
2015-09-23 11:13:40 +00:00
Paul Jensen
635f871132 am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.
2015-09-23 11:06:27 +00:00
Paul Jensen
a9e9834314 Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 2015-09-23 10:58:57 +00:00
Zach Jang
f8cda08986 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
2015-09-21 18:58:27 +00:00
Zach Jang
e54c195a53 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
2015-09-21 18:58:18 +00:00
Zach Riggle
683cd049f7 resolved conflicts for 521def98 to lmp-mr1-dev 2015-09-17 17:34:08 -04:00
Zach Jang
b2b3cecbd3 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
2015-09-17 20:44:41 +00:00
Zach Jang
7b5bf993e4 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
2015-09-17 20:32:53 +00:00
Zach Jang
fe4cbf2b1b 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
2015-09-17 20:24:00 +00:00
Zach Jang
cff4e09e26 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
2015-09-17 20:09:55 +00:00
Zach Jang
0a8197b1e4 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
2015-09-17 20:04:23 +00:00
Zach Jang
1cf21e443a DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
2015-09-17 01:20:27 +00:00
Zach Jang
bdf7f3583c DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
2015-09-17 01:17:58 +00:00
Zach Jang
32a420ea36 Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 2015-09-16 01:40:18 +00:00
Zach Jang
3ee9945be3 Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
This reverts commit 3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.

Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d
2015-09-16 01:38:41 +00:00
Zach Jang
203b43547d Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 2015-09-16 01:37:36 +00:00
Zach Jang
3b49affdb3 Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
2015-09-15 20:09:52 +00:00
Michael Wright
521def98c0 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.
2015-09-12 06:29:09 +00:00
Deepanshu Gupta
eb26f5cecd 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
2015-09-01 23:17:56 +00:00
Bart Sears
199c74eab1 Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev 2015-08-31 21:53:46 +00:00
Tao Bao
82b70db7dd [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
2015-08-31 14:34:14 -07:00
Michael Wright
4c330c6ae5 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
2015-08-28 19:47:23 +01:00
Michael Wright
78056370fa 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
2015-08-28 19:05:58 +01:00
Paul Jensen
a12044215b 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)
2015-08-28 12:48:11 -04:00
Deepanshu Gupta
a1be8b43e4 LayoutLib: Update golden test images. [DO NOT MERGE]
Also update the generated classes from the MyApplication test project.

Change-Id: I97bce3737c0cb528a61fa652988a2edb09ec885d
2015-08-25 17:12:16 -07:00
Deepanshu Gupta
c9862b4429 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
2015-08-25 16:06:57 -07:00
Deepanshu Gupta
b1ad4a1559 LayoutLib: Fix true transparency in status bar. [DO NOT MERGE]
Change-Id: Ieedf23cde9ab3e36c77501d30cc7e808e66a4782
(cherry picked from commit f9662c006c650c9f61f19a5e1ea4a76640eb85ca)
2015-08-25 12:06:59 -07:00
Deepanshu Gupta
da687918e1 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)
2015-08-25 12:06:58 -07:00
Deepanshu Gupta
8c674fda89 Fix layout mirroring. [DO NOT MERGE]
Change-Id: I7db398aa2d11dac1210e84922138f78f0c23bb9b
(cherry picked from commit a9090705efcc44f015486944e5aeb926173a7968)
2015-08-25 12:06:58 -07:00
Deepanshu Gupta
7aa3612940 Fix typo: s/FullScreen/Fullscreen/ in LayoutLib. [DO NOT MERGE]
Change-Id: Ia8d223ae01f08df945ab05615b07075b98a54a32
(cherry picked from commit 5a8f33f1b09b0311f1bbd1ec6b90db706edb5219)
2015-08-25 12:06:57 -07:00
Deepanshu Gupta
92f373fe32 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)
2015-08-25 12:06:57 -07:00
Deepanshu Gupta
66d914018c 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)
2015-08-25 12:06:57 -07:00
Deepanshu Gupta
6b1b651fed 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)
2015-08-25 12:06:56 -07:00
Deepanshu Gupta
5ad4dae157 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)
2015-08-25 12:06:56 -07:00
Deepanshu Gupta
723e136f96 Run setup for full tests only once. [DO NOT MERGE]
Change-Id: Iee64dbd88d473b7be08581f26ccddf649aed8e56
(cherry picked from commit a12ec8f1e28cb5a8601bf606852f1d34d7c91996)
2015-08-25 12:06:55 -07:00
Deepanshu Gupta
3ba16c1d9d LayoutLib: fix layout when nav bar is absent. [DO NOT MERGE]
Change-Id: I0d3ee6fd5a4656156a630d3b298533ea13eb8415
(cherry picked from commit 6e8d8ad2b7cffed751b2a382ac7b761954767188)
2015-08-25 12:06:55 -07:00
Deepanshu Gupta
55a363376b 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)
2015-08-25 12:06:54 -07:00
Deepanshu Gupta
d861fd81f7 Set support flag for custom layouts for RecyclerView. [DO NOT MERGE]
Change-Id: I3a0349c0482ae45e226b2016a0f24707c85edff4
(cherry picked from commit f7712d3524309c365b68f93497771084e6b5a66b)
2015-08-25 12:06:54 -07:00
Deepanshu Gupta
82fae62153 LayoutLib: translucent sys ui bars [DO NOT MERGE]
Change-Id: I9c294329fc78418c505a5115bc9c07da29595af2
(cherry picked from commit fc8f4aad7395eca11f6d9b82eb266b1f4ee5041b)
2015-08-25 12:06:53 -07:00
Deepanshu Gupta
9068539a48 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)
2015-08-25 12:06:53 -07:00
Deepanshu Gupta
e5afc3117b 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)
2015-08-25 12:06:52 -07:00
Deepanshu Gupta
c989950dbf 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)
2015-08-25 12:06:52 -07:00
Deepanshu Gupta
b2fdaca959 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)
2015-08-25 12:06:51 -07:00
Deepanshu Gupta
a14ec6f450 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)
2015-08-25 12:06:51 -07:00
Deepanshu Gupta
b1e21330f8 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)
2015-08-25 12:06:50 -07:00
Jens Ole Lauridsen
cd4d5b3f38 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)
2015-08-25 12:06:50 -07:00
Deepanshu Gupta
de13095d5d Update tests per new layoutlib_api [DO NOT MERGE]
Change-Id: Idc89ffceaf171abcf2b579f4e934b514ef209210
(cherry picked from commit d7b846c1814de34f2cea8507907f70618ec7cae0)
2015-08-25 12:06:50 -07:00
Deepanshu Gupta
db67caa60c Add missing resolveResValue call. [DO NOT MERGE]
Bug: http://b.android.com/178504
Change-Id: I7dde8094cf762893e4f7ea0d3de87a281c9602cd
(cherry picked from commit 5d1eaf4a197130f561b16c4ed083cf016b20ab92)
2015-08-25 12:06:49 -07:00
Deepanshu Gupta
6eef124657 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)
2015-08-25 12:06:49 -07:00
Deepanshu Gupta
4f5e6c6315 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)
2015-08-25 12:06:48 -07:00