Doris Liu
d992335ae6
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev am: 4d72cd9550
...
am: ce680bfd06
2017-04-21 23:46:29 +00:00
Adam Lesinski
ea957eb6d2
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev am: 5be3647a9e
...
am: 091fe96343
2017-04-21 23:40:31 +00:00
Doris Liu
ce680bfd06
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev
...
am: 4d72cd9550
2017-04-21 23:23:09 +00:00
Doris Liu
4d72cd9550
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev
2017-04-21 23:14:34 +00:00
Adam Lesinski
091fe96343
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
...
am: 5be3647a9e
2017-04-21 22:42:31 +00:00
Stefan Ramsauer
a3ced1c0af
Merge "Fix parameter name mismatch in getResourceIdentifier."
2017-04-21 22:37:35 +00:00
TreeHugger Robot
5be3647a9e
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
2017-04-21 22:35:57 +00:00
Seigo Nonaka
cfd5ce408f
Merge "Introduce TextView attribute for control justification." into oc-dev am: 31eeb08bdb
...
am: e7c2e03d22
2017-04-21 21:58:39 +00:00
Suprabh Shukla
475cb57d80
Merge "Renaming intent action for unknown sources" into oc-dev am: f277ccbca6
...
am: de8f784bb2
2017-04-21 21:45:24 +00:00
Seigo Nonaka
e7c2e03d22
Merge "Introduce TextView attribute for control justification." into oc-dev
...
am: 31eeb08bdb
2017-04-21 21:44:24 +00:00
Suprabh Shukla
de8f784bb2
Merge "Renaming intent action for unknown sources" into oc-dev
...
am: f277ccbca6
2017-04-21 21:31:45 +00:00
TreeHugger Robot
31eeb08bdb
Merge "Introduce TextView attribute for control justification." into oc-dev
2017-04-21 21:31:20 +00:00
TreeHugger Robot
f277ccbca6
Merge "Renaming intent action for unknown sources" into oc-dev
2017-04-21 21:22:09 +00:00
Seigo Nonaka
4cbb441425
Introduce TextView attribute for control justification.
...
Bug: 37447278
Test: am instrument -w -e class android.widget.cts.TextViewTest
android.widget.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I7946f460ad8a6c2423b464c27225411d155d4d8d
2017-04-21 21:17:58 +00:00
Doris Liu
5fb129c2ab
Behavior compat for child being manipulated outside Animatorset
...
When a child animator is being manipulated outside of the AnimatorSet,
such as when the child animator is running before the AnimatorSet gets
started, we need to make sure we maintain the behavoir on N:
The child animator will be re-started at its scheduled start time in
the AnimatorSet.
BUG: 37507882
Test: Repro steps in comment #1 & ag/2144081/
Change-Id: Ib97e85706f01d18a2e72fb4d1d678e22cf959894
2017-04-21 21:13:52 +00:00
Jakub Pawlowski
0f37b49721
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am: c8d5f84fcf am: e00b92e550 am: b4be7093da
...
am: c611b7ae90
2017-04-21 20:56:22 +00:00
Jakub Pawlowski
c611b7ae90
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am: c8d5f84fcf am: e00b92e550
...
am: b4be7093da
2017-04-21 20:50:07 +00:00
Jakub Pawlowski
b4be7093da
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am: c8d5f84fcf
...
am: e00b92e550
2017-04-21 20:43:55 +00:00
Jeff Sharkey
2d3bdf9201
Merge "Move PackageManager to new auto-doc feature!" into oc-dev am: 0a02259bba
...
am: 8203c3694a
2017-04-21 20:35:24 +00:00
Jakub Pawlowski
4634b5cd27
Bluetooth: improve getLeMaximumAdvertisingDataLength comment
...
Bug: 37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
2017-04-21 20:28:39 +00:00
Jeff Sharkey
8203c3694a
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
...
am: 0a02259bba
2017-04-21 20:26:59 +00:00
Adam Lesinski
50954d2b4e
Propagate density through AdaptiveIconDrawable and BitmapDrawable
...
Resources#getDrawableForDensity now propagates the overridden
density through to AdaptiveIconDrawable so that the density can be
propagated to leaf BitmapDrawables correctly.
This enables AdaptiveIconDrawable to support higher resolution
foreground/background bitmaps for use in Launcher.
Bug: 36039665
Test: bit CtsContentTestCases:android.content.res.cts.ResourcesTest
Change-Id: Iaa9a5592626e38e1ff839a76f7c6cfb9e16e5dc1
2017-04-21 13:25:44 -07:00
Jeff Sharkey
d85b1ddaeb
Merge "Fix code accounting bugs, track external app data." into oc-dev am: 4b32f7c676
...
am: 90d020d979
2017-04-21 20:20:33 +00:00
TreeHugger Robot
0a02259bba
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
2017-04-21 20:20:08 +00:00
Jeff Sharkey
90d020d979
Merge "Fix code accounting bugs, track external app data." into oc-dev
...
am: 4b32f7c676
2017-04-21 20:10:50 +00:00
Jeff Sharkey
4b32f7c676
Merge "Fix code accounting bugs, track external app data." into oc-dev
2017-04-21 20:01:43 +00:00
Android Build Merger (Role)
5e8fd5372b
Merge "Merge "Update HardwareBuffer API." into oc-dev am: 649040c7f6 am: d5fcb3a45f"
2017-04-21 19:59:22 +00:00
Craig Donner
06da6d21e3
Merge "Update HardwareBuffer API." into oc-dev am: 649040c7f6
...
am: d5fcb3a45f
2017-04-21 19:58:02 +00:00
Kang Li
ee8187688e
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources."
2017-04-21 19:53:35 +00:00
Dianne Hackborn
215f1ed817
Merge "Fix issue #32180780 : Sync adapters inappropriately being run..." into oc-dev am: 0fa2574ecb
...
am: a97ee07a5c
2017-04-21 19:41:58 +00:00
Craig Donner
d5fcb3a45f
Merge "Update HardwareBuffer API." into oc-dev
...
am: 649040c7f6
2017-04-21 19:40:01 +00:00
Dianne Hackborn
a97ee07a5c
Merge "Fix issue #32180780 : Sync adapters inappropriately being run..." into oc-dev
...
am: 0fa2574ecb
2017-04-21 19:32:27 +00:00
TreeHugger Robot
649040c7f6
Merge "Update HardwareBuffer API." into oc-dev
2017-04-21 19:28:32 +00:00
Stefan Ramsauer
dd48cc8ad4
Fix parameter name mismatch in getResourceIdentifier.
...
Test: No test since change is NOP.
Change-Id: Id069f18e7e75f3b34448cfbabb8ba84d7bb18d87
2017-04-21 12:25:11 -07:00
TreeHugger Robot
0fa2574ecb
Merge "Fix issue #32180780 : Sync adapters inappropriately being run..." into oc-dev
2017-04-21 19:23:11 +00:00
Joe Fernandez
f3803338cf
Merge "docs: Update Imageview JavaDoc comments" into oc-dev am: 62a24e9493
...
am: 2bc550372e
2017-04-21 18:53:15 +00:00
Joe Fernandez
8795bd8ee6
Merge "docs: Update TextView JavaDoc comments" into oc-dev am: 28973b3817
...
am: 474b5af269
2017-04-21 18:51:18 +00:00
Joe Fernandez
2bc550372e
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
...
am: 62a24e9493
2017-04-21 18:44:57 +00:00
Joe Fernandez
474b5af269
Merge "docs: Update TextView JavaDoc comments" into oc-dev
...
am: 28973b3817
2017-04-21 18:42:54 +00:00
TreeHugger Robot
62a24e9493
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
2017-04-21 18:36:51 +00:00
TreeHugger Robot
28973b3817
Merge "docs: Update TextView JavaDoc comments" into oc-dev
2017-04-21 18:34:14 +00:00
Kang Li
4d87d4101b
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev am: 8b4f17be85
...
am: 9d6cb20646
2017-04-21 18:20:11 +00:00
Seigo Nonaka
a691442ce0
Merge "Cache the Typeface based on the FontRequest." into oc-dev am: 5b96e55d90
...
am: a121eabf99
2017-04-21 18:18:19 +00:00
Jeff Sharkey
4347f8147b
Move PackageManager to new auto-doc feature!
...
Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: Ib368042e91be3ed702ede0facaf5c8d8d28853d4
2017-04-21 12:14:49 -06:00
Kang Li
9d6cb20646
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
...
am: 8b4f17be85
2017-04-21 18:11:33 +00:00
Seigo Nonaka
a121eabf99
Merge "Cache the Typeface based on the FontRequest." into oc-dev
...
am: 5b96e55d90
2017-04-21 18:09:44 +00:00
TreeHugger Robot
8b4f17be85
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
2017-04-21 18:03:10 +00:00
TreeHugger Robot
5b96e55d90
Merge "Cache the Typeface based on the FontRequest." into oc-dev
2017-04-21 18:00:55 +00:00
Felipe Leme
8923e1a0a9
Merge "Removed deprecated SaveInfo methods." into oc-dev am: fc533da920
...
am: 184347912d
2017-04-21 17:43:45 +00:00
Felipe Leme
184347912d
Merge "Removed deprecated SaveInfo methods." into oc-dev
...
am: fc533da920
2017-04-21 17:35:12 +00:00
