Christopher Tate
3a4a018572
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c am: 1c3be1a5b1 am: 6b24c84fa2
...
am: 6bf184819c
2016-06-17 21:10:51 +00:00
Christopher Tate
6bf184819c
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c am: 1c3be1a5b1
...
am: 6b24c84fa2
2016-06-17 06:50:28 +00:00
Christopher Tate
6b24c84fa2
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e am: d2a4e1b39c
...
am: 1c3be1a5b1
2016-06-17 00:38:13 +00:00
Christopher Tate
1c3be1a5b1
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab am: e2c9b1af3e
...
am: d2a4e1b39c
2016-06-17 00:32:26 +00:00
Christopher Tate
d2a4e1b39c
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 am: d6c1126fab
...
am: e2c9b1af3e
2016-06-17 00:24:29 +00:00
Christopher Tate
e2c9b1af3e
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
...
am: d6c1126fab
2016-06-17 00:18:48 +00:00
Christopher Tate
d6c1126fab
resolve merge conflicts of cffb19c to mnc-dev
...
am: 3f9ea2d386
2016-06-17 00:15:07 +00:00
Christopher Tate
3f9ea2d386
resolve merge conflicts of cffb19c to mnc-dev
...
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
2016-06-16 16:31:39 -07:00
Christopher Tate
cffb19c812
Don\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am: cd777e95a7
...
am: ec6c3f7a32
2016-06-16 22:30:17 +00:00
Christopher Tate
cd777e95a7
Don\'t trust callers to supply app info to bindBackupAgent()
...
am: c58054f25f
2016-06-16 22:21:37 +00:00
Adam Lesinski
02e68a1619
Merge \\\"ResourcesManager: Allow managed addition of library asset paths\\\" into nyc-dev am: 464bda8a2b am: c3ab1b7c0a
...
am: f4152a9c7e
2016-06-15 23:14:51 +00:00
Adam Lesinski
f4152a9c7e
Merge \\"ResourcesManager: Allow managed addition of library asset paths\\" into nyc-dev am: 464bda8a2b
...
am: c3ab1b7c0a
2016-06-15 22:57:08 +00:00
Adam Lesinski
c3ab1b7c0a
Merge \"ResourcesManager: Allow managed addition of library asset paths\" into nyc-dev
...
am: 464bda8a2b
2016-06-15 22:44:43 +00:00
Adam Lesinski
464bda8a2b
Merge "ResourcesManager: Allow managed addition of library asset paths" into nyc-dev
2016-06-15 22:35:26 +00:00
Alexander Hills
eb4420a985
Merge \\"Adds a flag to Action.WearableExtender to display actions inline on Wear\\" into nyc-mr1-dev am: 7816efa6af
...
am: c295774697
2016-06-15 19:40:19 +00:00
Adam Lesinski
25f48886b2
ResourcesManager: Allow managed addition of library asset paths
...
This allows WebView to add itself to the ResourcesManager and
remain their even after configuration changes and multi-window
changes.
Bug:29112218
Change-Id: I2cb131ae2c61fb58c48babafdd46c1882be96aa9
2016-06-15 12:00:18 -07:00
Aurimas Liutikas
6465299aec
Merge "Clarify Fragment construtor javadoc."
2016-06-15 16:37:39 +00:00
Alex Hills
c295774697
Merge \"Adds a flag to Action.WearableExtender to display actions inline on Wear\" into nyc-mr1-dev
...
am: 7816efa6af
2016-06-15 16:13:52 +00:00
Alexander Hills
7816efa6af
Merge "Adds a flag to Action.WearableExtender to display actions inline on Wear" into nyc-mr1-dev
2016-06-15 16:02:48 +00:00
Aurimas Liutikas
c59422a2c6
Clarify Fragment construtor javadoc.
...
Bug:
https://code.google.com/p/android/issues/detail?id=170497
https://code.google.com/p/android/issues/detail?id=55991
Change-Id: If2309f441bb947f32da60ba7926cc6796e472fdf
2016-06-14 16:50:07 -07:00
TreeHugger Robot
064aa25de3
Merge "Remove TransitionListener after transition completes."
2016-06-14 23:45:47 +00:00
Selim Cinek
a592bdf4ed
Merge \\\"Fixed another case where the systemUI could crashloop\\\" into nyc-dev am: 02ab2f52bf am: 91965ce2e9
...
am: b3e68016e1
2016-06-14 23:24:39 +00:00
Selim Cinek
b3e68016e1
Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am: 02ab2f52bf
...
am: 91965ce2e9
2016-06-14 23:19:50 +00:00
Selim Cinek
91965ce2e9
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
...
am: 02ab2f52bf
2016-06-14 23:12:12 +00:00
Selim Cinek
24edc3934d
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
...
am: 02ab2f52bf
2016-06-14 23:11:25 +00:00
George Mount
25f98a4c01
Remove TransitionListener after transition completes.
...
Bug 22232371
Change-Id: I1ba6f8742792ff00996b7fdaa892d5e1388ef61c
2016-06-14 14:11:28 -07:00
Christopher Tate
c58054f25f
Don't trust callers to supply app info to bindBackupAgent()
...
Get the canonical identity and metadata about the package from the
Package Manager at time of usage rather than rely on the caller to
have gotten things right, even when the caller has the system uid.
Bug 28795098
Change-Id: I215786bc894dedf7ca28e9c80cefabd0e40ca877
2016-06-14 13:28:43 -07:00
Selim Cinek
279fa867e5
Fixed another case where the systemUI could crashloop
...
Because it's not guaranteed to use any builder at all,
there is another case where the SmallIcon could remain null.
We are now checking this lazily instead of ahead of time.
Change-Id: I7a0feff6911b2bce6707427259d3423131a26e32
Fixes: 29255365
2016-06-14 13:02:56 -07:00
Adrian Roos
87818fa11c
Merge \\\"Fix jittery action bar during transitions\\\" into nyc-dev am: 8507d98ad1 am: 2c50962538
...
am: f381297dea
2016-06-14 19:59:02 +00:00
Adrian Roos
2c0c3b941b
Merge \\\"Make RemoteView margins density-change safe\\\" into nyc-dev am: 26e864c398 am: 06976edc0b
...
am: eac63514e4
2016-06-14 19:58:59 +00:00
Adrian Roos
f381297dea
Merge \\"Fix jittery action bar during transitions\\" into nyc-dev am: 8507d98ad1
...
am: 2c50962538
2016-06-14 19:53:31 +00:00
Adrian Roos
eac63514e4
Merge \\"Make RemoteView margins density-change safe\\" into nyc-dev am: 26e864c398
...
am: 06976edc0b
2016-06-14 19:53:25 +00:00
Adrian Roos
2c50962538
Merge \"Fix jittery action bar during transitions\" into nyc-dev
...
am: 8507d98ad1
2016-06-14 19:42:03 +00:00
Adrian Roos
06976edc0b
Merge \"Make RemoteView margins density-change safe\" into nyc-dev
...
am: 26e864c398
2016-06-14 19:41:59 +00:00
Adrian Roos
746a64493b
Merge \"Fix jittery action bar during transitions\" into nyc-dev
...
am: 8507d98ad1
2016-06-14 19:41:57 +00:00
Adrian Roos
ba38cc6992
Merge \"Make RemoteView margins density-change safe\" into nyc-dev
...
am: 26e864c398
2016-06-14 19:41:54 +00:00
Adrian Roos
8507d98ad1
Merge "Fix jittery action bar during transitions" into nyc-dev
2016-06-14 19:31:25 +00:00
Adrian Roos
26e864c398
Merge "Make RemoteView margins density-change safe" into nyc-dev
2016-06-14 19:31:14 +00:00
Makoto Onuki
1424be1e60
Merge \\\"Don\\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\\" into nyc-dev am: 5e94a16b74 am: f7c91b8838
...
am: df30e75294
2016-06-14 18:37:54 +00:00
Makoto Onuki
df30e75294
Merge \\"Don\\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\\" into nyc-dev am: 5e94a16b74
...
am: f7c91b8838
2016-06-14 18:32:35 +00:00
Makoto Onuki
f7c91b8838
Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
...
am: 5e94a16b74
2016-06-14 18:26:00 +00:00
Makoto Onuki
e220722bdf
Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
...
am: 5e94a16b74
2016-06-14 18:25:25 +00:00
Makoto Onuki
5e94a16b74
Merge "Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent" into nyc-dev
2016-06-14 18:17:01 +00:00
Aurimas Liutikas
73e88e9a5a
Merge "Clarify Fragment#onHiddenChanged() documentation."
2016-06-14 17:32:04 +00:00
TreeHugger Robot
b58b9c2c27
Merge "Fix mapping two shared elements to a single shared element."
2016-06-14 17:31:18 +00:00
Selim Cinek
2975ddfe75
Merge \\\"Fixed a bug with a legacy notification API\\\" into nyc-dev am: 05e19bba37 am: 844d178c2e
...
am: bac9f44555
2016-06-14 17:16:50 +00:00
Aurimas Liutikas
c3cfdaf651
Clarify Fragment#onHiddenChanged() documentation.
...
Prior comment said that fragment was hidden for both true and false
values of hidden.
Bug:
https://code.google.com/p/android/issues/detail?id=53178
Change-Id: I453ff52692157cffafef34d165c1436e845c217d
2016-06-14 17:08:00 +00:00
Selim Cinek
bac9f44555
Merge \\"Fixed a bug with a legacy notification API\\" into nyc-dev am: 05e19bba37
...
am: 844d178c2e
2016-06-14 17:07:52 +00:00
Selim Cinek
1eb9ae9220
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
...
am: 05e19bba37
2016-06-14 17:02:40 +00:00
Selim Cinek
844d178c2e
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
...
am: 05e19bba37
2016-06-14 17:02:39 +00:00
