Pavlin Radoslavov
e144575a7f
Merge \\"Unlock mBluetoothLock.readLock() instead of double-locking it\\" am: 4467c845c0
...
am: 2df165b8db
2016-06-09 21:19:29 +00:00
Pavlin Radoslavov
2df165b8db
Merge \"Unlock mBluetoothLock.readLock() instead of double-locking it\"
...
am: 4467c845c0
2016-06-09 21:16:32 +00:00
TreeHugger Robot
9e9c78f8ce
Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev
2016-06-09 21:16:03 +00:00
Treehugger Robot
4467c845c0
Merge "Unlock mBluetoothLock.readLock() instead of double-locking it"
2016-06-09 21:10:29 +00:00
Adam Powell
fb310f6a2f
Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
...
am: 7a37f8945f
2016-06-09 21:05:23 +00:00
TreeHugger Robot
7a37f8945f
Merge "Make Activity.getReferrer tolerate custom Parcelables in intents" into nyc-dev
2016-06-09 20:57:53 +00:00
Christopher Tate
36cb2a7a91
Turn down factory-default lock wallpaper support
...
The infrastructure is here but not yet fully plumbed, so gracefully
provide the historical behavior until the rest is in place.
Bug 29220492
Change-Id: I36feaf68099d85e4ae11a5262002ee85346703ed
2016-06-09 13:47:19 -07:00
Phil Weaver
155edc693e
Improve accessibility window title behavior
...
Un-reverts ag/1057448, but uses a version of Resources#getText
that returns null rather than throw an exception when no title
is available. This is the same call made before, so this change
should be safer.
Bug: 28744278
Change-Id: I8c123f4f6d74f796ab9e8ffcf955aaf881770da1
2016-06-09 13:45:46 -07:00
Philip P. Moltmann
5fe5dcdfd6
Merge \"Cache resources needed to sort media sizes.\" into nyc-dev
...
am: 142fc425c4
2016-06-09 20:43:28 +00:00
Philip P. Moltmann
142fc425c4
Merge "Cache resources needed to sort media sizes." into nyc-dev
2016-06-09 20:35:59 +00:00
Andrii Kulian
84db67cb71
Merge \"Don\'t update mTaskToReturnTo when task is cleared\" into nyc-dev
...
am: 1a77efe9ba
2016-06-09 20:33:52 +00:00
Andrii Kulian
1a77efe9ba
Merge "Don't update mTaskToReturnTo when task is cleared" into nyc-dev
2016-06-09 20:27:29 +00:00
Aurimas Liutikas
18240e6ebc
Correct parentActivity example in Activity Element docs.
...
Bug:
https://code.google.com/p/android/issues/detail?id=74474
Change-Id: I09d07a69d6aa0087e60443ed819541e979012948
(cherry picked from commit 0b54c6c74a
2016-06-09 20:20:07 +00:00
Pavlin Radoslavov
66d7883696
Unlock mBluetoothLock.readLock() instead of double-locking it
...
am: 7ee53be300
2016-06-09 20:13:44 +00:00
Pavlin Radoslavov
b9154bc988
Unlock mBluetoothLock.readLock() instead of double-locking it
...
Bug: 29011117
Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1
(cherry picked from commit 7ee53be300
2016-06-09 13:10:54 -07:00
Andrew Solovay
9e9a3bbcae
docs: Noted that N Preview doc is available online as of DP4
...
See first comment for doc stage location.
bug: 29215447
Change-Id: I864e0a86fdad2ab318c5d20e193e52e66dff9695
2016-06-09 13:06:30 -07:00
Dianne Hackborn
41bfaf870e
Fix more of issue #28689719 : Runtime restart
...
Change-Id: I0cce1cef884cf1508f1e726ea3439a5ffee84993
2016-06-09 12:58:25 -07:00
Pavlin Radoslavov
7ee53be300
Unlock mBluetoothLock.readLock() instead of double-locking it
...
Bug: 29011117
Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1
2016-06-09 12:58:07 -07:00
Adam Lesinski
c1b0ebf579
ResourcesManager: Apply ContextThemeWrapper config
...
The ContextThemeWrapper's configuration override must also
be applied to ResourcesManager during a configuration change.
Bug:27644297
Change-Id: Ic126308b753979c18801d422a8243aa4daf45147
2016-06-09 12:57:45 -07:00
Robert Carr
5978cf5ff8
Merge \"PiP animation: Move window with resize when ending animation.\" into nyc-dev
...
am: 4624d687f7
2016-06-09 19:36:27 +00:00
Adam Powell
d3c63a66f2
Make Activity.getReferrer tolerate custom Parcelables in intents
...
Referrer information is passed as an intent extra to each Activity,
therefore if that intent contains a custom parcelable unmarshaling
the intent extras will fail in a call to getReferrer. Insulate apps
from this concern and log a warning when it happens.
Bug 28972438
Change-Id: I37dbc033bfcfe816e4b58b382c012854fbed943b
2016-06-09 12:36:16 -07:00
Philip P. Moltmann
0273d5d4ed
Merge \"Handling of Fuji Xerox in RecommendationService.\" into nyc-dev
...
am: 5398f2731b
2016-06-09 19:31:57 +00:00
TreeHugger Robot
4624d687f7
Merge "PiP animation: Move window with resize when ending animation." into nyc-dev
2016-06-09 19:28:11 +00:00
Philip P. Moltmann
5398f2731b
Merge "Handling of Fuji Xerox in RecommendationService." into nyc-dev
2016-06-09 19:24:05 +00:00
Andrii Kulian
4b7f2d46be
Don't update mTaskToReturnTo when task is cleared
...
If activity launch has moved other task that was over home while
clearing task - don't override its mTaskToReturnTo not to loose
the original value of other task.
Bug: 28986980
Change-Id: Ib1680769fbb8a8d99f2b210c8d9cd8fe6fd5a196
2016-06-09 11:46:23 -07:00
Eric Schmidt
52f182be1d
Merge \\\"docs: Added links to performance resources section\\\" into mnc-io-docs am: e4b1149320 am: 2dea7d3836
...
am: b1a99c46b6
2016-06-09 18:02:19 +00:00
Eric Schmidt
b1a99c46b6
Merge \\"docs: Added links to performance resources section\\" into mnc-io-docs am: e4b1149320
...
am: 2dea7d3836
2016-06-09 17:56:38 +00:00
Eric Schmidt
2dea7d3836
Merge \"docs: Added links to performance resources section\" into mnc-io-docs
...
am: e4b1149320
2016-06-09 17:45:53 +00:00
Eric Schmidt
e4b1149320
Merge "docs: Added links to performance resources section" into mnc-io-docs
2016-06-09 17:37:26 +00:00
Tony Mak
751c00e3c0
Use startActivityDismissingKeyguard to show vpn setting page in keyguard
...
Fix: 29200690
Change-Id: I47ff08ce379b985abf84cd931f7f83e918acc5f8
2016-06-09 18:36:49 +01:00
Robert Carr
a9408d4a48
PiP animation: Move window with resize when ending animation.
...
At the end of the animation (when going from larger to smaller),
we are left with a scaled surface, that we want to seamlessly
resize to an unscaled surface of the new size. Because we have scaled
the shadow region of the surface, the position of the content
will differ before and after the resize applies. We use new
SurfaceFlinger API to cause position updates to apply after
resize. Because we have to switch into SCALING_MODE_FREEZE,
we could end up prematurely cropping the window, so we
switch to using screen space crop for the pinned stack.
Bug: 28899837
Change-Id: I9b762a237413e4fa3d432e67d30c7125bfef484c
2016-06-09 10:31:17 -07:00
Aurimas Liutikas
b93d526ff4
Merge \\\"Correct the size of example bitmap for xxhdpi.\\\" into mnc-io-docs am: 396ed8d2cf am: 6e70538600
...
am: e82ac10fa2
2016-06-09 17:09:26 +00:00
Aurimas Liutikas
9ce7ec6770
Merge \\\"Remove duplicate the from AppBar documentation.\\\" into mnc-io-docs am: f9f7a29fe9 am: 9bd21c0fbb
...
am: 9ac187304b
2016-06-09 17:09:14 +00:00
Aurimas Liutikas
964141ab9d
Merge \\\"Fix code example in testing-support-library.\\\" into mnc-io-docs am: e172a4b692 am: 5b8233126d
...
am: 248eb25863
2016-06-09 17:09:05 +00:00
Aurimas Liutikas
8c3edafda4
Merge \\\"Fix a link to CustomTabsCallback in support-library docs.\\\" into mnc-io-docs am: 2ff2814a4a am: 5d75a24896
...
am: d8b2c49475
2016-06-09 17:08:58 +00:00
Aurimas Liutikas
e82ac10fa2
Merge \\"Correct the size of example bitmap for xxhdpi.\\" into mnc-io-docs am: 396ed8d2cf
...
am: 6e70538600
2016-06-09 16:57:02 +00:00
Aurimas Liutikas
9ac187304b
Merge \\"Remove duplicate the from AppBar documentation.\\" into mnc-io-docs am: f9f7a29fe9
...
am: 9bd21c0fbb
2016-06-09 16:56:58 +00:00
Aurimas Liutikas
248eb25863
Merge \\"Fix code example in testing-support-library.\\" into mnc-io-docs am: e172a4b692
...
am: 5b8233126d
2016-06-09 16:56:54 +00:00
Aurimas Liutikas
d8b2c49475
Merge \\"Fix a link to CustomTabsCallback in support-library docs.\\" into mnc-io-docs am: 2ff2814a4a
...
am: 5d75a24896
2016-06-09 16:56:50 +00:00
Aurimas Liutikas
fa1965e316
Swap fill_parent with match_parent in best practices doc.
...
Bug:
https://code.google.com/p/android/issues/detail?id=61600
Change-Id: I86ef4f69800c3271fe6e4a5b09a184b2de7f6bc9
(cherry picked from commit 309e97fc3c
2016-06-09 16:47:25 +00:00
Aurimas Liutikas
6e70538600
Merge \"Correct the size of example bitmap for xxhdpi.\" into mnc-io-docs
...
am: 396ed8d2cf
2016-06-09 16:45:15 +00:00
Aurimas Liutikas
9bd21c0fbb
Merge \"Remove duplicate the from AppBar documentation.\" into mnc-io-docs
...
am: f9f7a29fe9
2016-06-09 16:45:13 +00:00
Aurimas Liutikas
5b8233126d
Merge \"Fix code example in testing-support-library.\" into mnc-io-docs
...
am: e172a4b692
2016-06-09 16:45:12 +00:00
Aurimas Liutikas
5d75a24896
Merge \"Fix a link to CustomTabsCallback in support-library docs.\" into mnc-io-docs
...
am: 2ff2814a4a
2016-06-09 16:45:10 +00:00
Aurimas Liutikas
12edbe1751
Fix a spelling error in Supporting Languages page.
...
Bug:
https://code.google.com/p/android/issues/detail?id=71378
Change-Id: I82bc1b3e9b20fdafc74ef544e5bde4f22c47f2e3
(cherry picked from commit 52eae0ac1e
2016-06-09 16:44:21 +00:00
Aurimas Liutikas
396ed8d2cf
Merge "Correct the size of example bitmap for xxhdpi." into mnc-io-docs
2016-06-09 16:42:17 +00:00
Aurimas Liutikas
f9f7a29fe9
Merge "Remove duplicate the from AppBar documentation." into mnc-io-docs
2016-06-09 16:41:55 +00:00
Philip P. Moltmann
620c5af97b
Handling of Fuji Xerox in RecommendationService.
...
- Display name
- Fix exclusion of Fuji from Xerox plugin
Bug: 28908572
Change-Id: I00c235a4eb09a681717eb3be65d586246a069f4b
2016-06-09 09:40:00 -07:00
Aurimas Liutikas
e172a4b692
Merge "Fix code example in testing-support-library." into mnc-io-docs
2016-06-09 16:39:26 +00:00
Aurimas Liutikas
2ff2814a4a
Merge "Fix a link to CustomTabsCallback in support-library docs." into mnc-io-docs
2016-06-09 16:39:15 +00:00
