Adam Powell
7cb761fe8c
Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev
2014-10-09 20:08:41 +00:00
Adam Powell
19a9e6c23b
Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev
2014-10-09 19:57:00 +00:00
Adam Powell
a7a735fb2a
Document that MarginLayoutParams margins should be positive.
...
Negative margins can cause all sorts of other problematic assumptions,
subtle errors and unexpected behavior. While they technically work
developers should steer clear of them.
Change-Id: Ia1f7d9a33e25444ebdc3c32679ae1179210558e1
2014-10-09 12:54:52 -07:00
Tim Kilbourn
bb76d5cd88
am 5d7f58be: am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev
...
* commit '5d7f58be2c034823d6e5cfab847ad50b2a463dfc':
Don't start SearchDialog on television.
2014-10-09 19:17:10 +00:00
Tim Kilbourn
5d7f58be2c
am 37bd0776: Merge "Don\'t start SearchDialog on television." into lmp-dev
...
* commit '37bd07768a05aabb0905608606f354a488a2d5cf':
Don't start SearchDialog on television.
2014-10-09 19:09:30 +00:00
Jeff Hao
6b7515dd0d
Merge "Improve priority ordering of apps when performing boot dexopt." into lmp-mr1-dev
2014-10-09 18:06:48 +00:00
Christopher Tate
a4d5471fc6
am 3a8e28c1: am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev
...
* commit '3a8e28c1d7dc474b70e937774de5eba70d528674':
Turn on dimension validation in wallpaper restore
2014-10-09 16:57:51 +00:00
Adam Lesinski
03be7ab529
am 6167950b: am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev
...
* commit '6167950b7a5a8b9f021e9656b42b9b48bfbcbf80':
Remove UsageEvents#resetToStart() as it doesn't work
2014-10-09 16:57:34 +00:00
Adam Powell
45a9da5076
Throw a more descriptive exception when adding null to a ViewGroup
...
Help developers during debugging bad calls to addView by throwing an
IllegalArgumentException earlier rather than implicitly tossing NPE
the first time the child view is accessed.
Change-Id: I4a554635815a5d0b415f637b93592fb45973f26d
2014-10-09 09:47:03 -07:00
Christopher Tate
3a8e28c1d7
am c0a30bcf: Merge "Turn on dimension validation in wallpaper restore" into lmp-dev
...
* commit 'c0a30bcfaecf38ab5b55c53e82505570ffffa71e':
Turn on dimension validation in wallpaper restore
2014-10-09 16:46:36 +00:00
Adam Lesinski
6167950b7a
am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev
...
* commit '59d208ddc1c5c51ae4d4f19ffbaf7685e534fe7f':
Remove UsageEvents#resetToStart() as it doesn't work
2014-10-09 16:46:14 +00:00
ztenghui
e6411c76c4
Merge "Support dot separation as the svg path data did." into lmp-mr1-dev
2014-10-09 16:34:40 +00:00
Eino-Ville Talvala
7e7a14c541
am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev
...
* commit 'eeec4b9ebc15545e59985eab29385157cbbd8e9f':
Camera2: Docs cleanup, especially units and range
camera2: Update docs only for legacy devices
2014-10-09 13:04:08 +00:00
Dianne Hackborn
d83e9e4280
am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
...
* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
Put in real "code" (aka marketing) name.
2014-10-09 13:03:21 +00:00
Jeff Sharkey
b424849533
am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev
...
* commit 'b01a5ba2b7c1bc22e30d6cc16c30f8e1215701cd':
Bring along more ApplicationInfo fields.
2014-10-09 13:03:07 +00:00
Eino-Ville Talvala
eeec4b9ebc
am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev
...
* commit 'ef773e3569969592fb220b7ccc49dafcabfdd67a':
Camera2: Docs cleanup, especially units and range
camera2: Update docs only for legacy devices
2014-10-09 03:02:35 +00:00
Tim Kilbourn
37bd07768a
Merge "Don't start SearchDialog on television." into lmp-dev
2014-10-09 00:49:36 +00:00
Alan Viverette
fe087d38a8
Merge "Fix invalid bounds detection in ExploreByTouchHelper" into lmp-mr1-dev
2014-10-09 00:32:56 +00:00
Dianne Hackborn
0761b1b5eb
am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
...
* commit '89b196958fee07475765bd3c458098464ba16f2e':
Put in real "code" (aka marketing) name.
2014-10-09 00:14:54 +00:00
Jeff Sharkey
b01a5ba2b7
am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev
...
* commit '562262cc89838529316ff2f3e511c0d876b08677':
Bring along more ApplicationInfo fields.
2014-10-09 00:14:25 +00:00
Tim Kilbourn
99e9095430
Don't start SearchDialog on television.
...
Bug: 17654744
Change-Id: Ie76405d648b7ac34a70465e275315f9cf277a3fe
2014-10-08 17:01:42 -07:00
ztenghui
4cc3e2704a
Support dot separation as the svg path data did.
...
Like "0.0.0" will be separated to "0.0 .0" now, just to make sure we are more
complied with svg path data.
b/17892882
Change-Id: Id7b64e9882f5174aa794a0256e2a29d66c724876
2014-10-08 15:51:37 -07:00
Christopher Tate
c0a30bcfae
Merge "Turn on dimension validation in wallpaper restore" into lmp-dev
2014-10-08 21:48:10 +00:00
Jeff Hao
272bf3a274
Improve priority ordering of apps when performing boot dexopt.
...
Added core apps and updated system apps.
Bug: 17641843
Change-Id: Ia00ea3399cf1e1acaef45ff8df8f754442de5185
2014-10-08 20:36:24 +00:00
Adam Lesinski
59d208ddc1
Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-dev
2014-10-08 20:34:55 +00:00
Adam Lesinski
54e064bcea
Remove UsageEvents#resetToStart() as it doesn't work
...
After completely iterating over a UsageEvents object, the internal parcel
is recycled. If resetToStart is called then, it does nothing.
Bug:17909428
Change-Id: I7bc68d3429e4621a50dedbfc1789576d44dbb3be
2014-10-08 12:33:16 -07:00
Christopher Tate
431906b34f
Turn on dimension validation in wallpaper restore
...
Bug 17906491
Change-Id: I4c76c3197df95b51a6e44d1fe2d522b6c05284e5
2014-10-08 12:19:48 -07:00
Eino-Ville Talvala
ef773e3569
Merge changes Id09663d8,Ie88f3750 into lmp-dev
...
* changes:
Camera2: Docs cleanup, especially units and range
camera2: Update docs only for legacy devices
2014-10-08 18:48:31 +00:00
Eino-Ville Talvala
fd3e2892f2
Camera2: Docs cleanup, especially units and range
...
- Add entries for units and range into javadoc
- Fix up existing units entries and add new ones
- Fix up range entries to be consistent for enums
- Add range entries where it makes sense
- Minor fix to javadoc gen to allow for code indentation
- Lots of edits for consistency, especially to
available* entries.
Bug: 16525650
Change-Id: Id09663d897ec98122073e6e13719731ec0de4dad
2014-10-08 11:28:59 -07:00
Dan Sandler
621fa30c54
am 9eef8749: am 2200f86f: All (er, L) is finally revealed.
...
* commit '9eef8749232c00afad5ca3c26736c0be785cb8c1':
All (er, L) is finally revealed.
2014-10-08 18:25:57 +00:00
Dan Sandler
9eef874923
am 2200f86f: All (er, L) is finally revealed.
...
* commit '2200f86f800876d005f911e6864708fa9772d03a':
All (er, L) is finally revealed.
2014-10-08 18:16:01 +00:00
Dianne Hackborn
89b196958f
Merge "Put in real "code" (aka marketing) name." into lmp-dev
2014-10-08 17:59:19 +00:00
Jeff Sharkey
562262cc89
Merge "Bring along more ApplicationInfo fields." into lmp-dev
2014-10-08 17:25:39 +00:00
Jeff Sharkey
7f1a57a3e7
Bring along more ApplicationInfo fields.
...
When we added scan paths, we forgot to bring them along through
Parcel and copy constructor.
Bug: 17900178
Change-Id: I0ee9374f909d375768045976fd88cee7431f7d4d
2014-10-08 10:14:53 -07:00
Jeff Brown
45bdf81a48
am e1449dfc: am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev
...
* commit 'e1449dfc55113bc9eceb7fd74c8f66ff19a35dea':
Reapply animation duration scale each time it is started.
2014-10-08 05:24:37 +00:00
Jeff Brown
e1449dfc55
am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev
...
* commit '32b9f4a650d1b8b52b85a27109f95fde030dff66':
Reapply animation duration scale each time it is started.
2014-10-08 05:12:57 +00:00
Dan Sandler
2200f86f80
All (er, L) is finally revealed.
...
If you exceed 20000 points, please send in a screenshot.
Bug: 15984887
Change-Id: I1164160bfa8e7dca3b9e7d7ca5d50ef9abd38b61
2014-10-08 04:01:01 +00:00
Dianne Hackborn
955d8d69ea
Put in real "code" (aka marketing) name.
...
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
2014-10-07 20:17:19 -07:00
Jeff Brown
32b9f4a650
Merge "Reapply animation duration scale each time it is started." into lmp-dev
2014-10-07 23:53:23 +00:00
Jeff Brown
7a08fe0e09
Reapply animation duration scale each time it is started.
...
When Battery Saver mode is enabled, we set the animation duration
scale factor to 0 to effectively disable all animations. Later
when it is disabled, we reset the animation duration scale
factor to 1.
This change ensures that we reapply the duration scale factor
whenever the animation is started instead of only applying it
once when the duration is set (usually when the animation is
created). This ensures that the correct scale factor is applied
even when it changes after the animation has been initialized.
Previously, certain animations would continue to be suppressed
even after Battery Saver mode was disengaged. This wasn't much
of an issue when the duration scale was initially implemented as
a developer setting but now that it is exposed via Battery Saver
the artifacts caused by this bug have become visible to users.
Bug: 17887431
Change-Id: I91ba5ca0505d02ac389a31d067e38886112fa0c8
2014-10-07 15:55:35 -07:00
Alan Viverette
0660042a26
Merge "Mutate and apply theme if needed before caching themed drawables" into lmp-mr1-dev
2014-10-07 22:09:49 +00:00
Alan Viverette
727cae197b
Mutate and apply theme if needed before caching themed drawables
...
This ensures that drawables are completely separated from their cached
constant states before applying a theme. After this, we can remove the
implicit (and incomplete) mutation in the clone constructors.
Also implements missing mutate() method on ClipDrawable.
BUG: 17646144
Change-Id: If0d66b0a85724d76e0a4f506758c7ba3c0aa3410
2014-10-07 15:08:47 -07:00
Christopher Tate
152893dd66
am 93e5e859: am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev
...
* commit '93e5e859e3d2c0f4d4f47c90d370b38be4440655':
Accept any restored wallpaper
2014-10-07 21:59:10 +00:00
Christopher Tate
93e5e859e3
am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev
...
* commit 'ae456fd894c5a41f859196016a7c49113b235eda':
Accept any restored wallpaper
2014-10-07 21:53:54 +00:00
Christopher Tate
ae456fd894
Merge "Accept any restored wallpaper" into lmp-dev
2014-10-07 21:50:08 +00:00
Adam Lesinski
18ab83e571
am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev
...
* commit 'f189c445b84365a3f1bd2b678fdca37f9df8d5d1':
Load shared library dependencies for AppWidgets
2014-10-07 20:03:24 +00:00
Andres Morales
5d62388192
am 4e558355: am 258d2221: Fix build, previous commit failed to remove an import
...
* commit '4e5583554151ea95d8d573e3d64947afbc51f34f':
Fix build, previous commit failed to remove an import
2014-10-07 20:03:14 +00:00
Andres Morales
6ef845d34a
am b4589115: am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev
...
* commit 'b4589115ad5ca8a98aa8f9b75296502658ae6416':
Remove dead NFC unlock code from fw/base
2014-10-07 20:03:09 +00:00
Adam Lesinski
f189c445b8
am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev
...
* commit '1a98dd5cc7ea89793208b51983198bfbeade5ccc':
Load shared library dependencies for AppWidgets
2014-10-07 19:58:59 +00:00
Andres Morales
4e55835541
am 258d2221: Fix build, previous commit failed to remove an import
...
* commit '258d222152a410341ddad045ce92e57dd7ab454e':
Fix build, previous commit failed to remove an import
2014-10-07 19:58:41 +00:00