Neil Fuller
4135a54df9
Merge "Add ICU4J APIs for Android" am: cb02371ca7
...
am: ec1349df9c
* commit 'ec1349df9c1759ca728fc637738592902f2aa44b':
Add ICU4J APIs for Android
2015-12-08 10:56:41 +00:00
Michael Wright
37c8bcbcc9
Merge "Add support for locking the screen when the lid is closed" am: 9dc3c36c9c
...
am: 4d9e6190b1
* commit '4d9e6190b186f1d2e1cd25defd0d6e12dd833b38':
Add support for locking the screen when the lid is closed
2015-12-08 10:55:07 +00:00
Neil Fuller
ec1349df9c
Merge "Add ICU4J APIs for Android"
...
am: cb02371ca7
* commit 'cb02371ca70a81796c75bd3bbf88478caf6ea7b7':
Add ICU4J APIs for Android
2015-12-08 10:47:59 +00:00
Neil Fuller
cb02371ca7
Merge "Add ICU4J APIs for Android"
2015-12-08 10:42:51 +00:00
Zoltan Szatmary-Ban
ed6c8cd6ca
Merge "Make base user restrictions queriable for system apps"
2015-12-08 10:24:08 +00:00
Ritesh Reddy
188ae9dc22
Enabled SoftAP Configuration Backup
...
Backing up SoftAP Configuration through WifiManager API.
Bug: 5343116
Change-Id: If17effb98c3489246d817fa3612f3f11b9ead9ab
2015-12-08 10:21:53 +00:00
Daichi Hirono
a57d9ed090
Turn MtpDocumentsService foreground when devices are opend.
...
BUG=26047393
Change-Id: I70f69c5ddec500ed61d1a76fb9e2e296813b2a4e
2015-12-08 17:27:04 +09:00
Tony Mak
415369ead5
Add Email.ENTEPRISE_CONTENT_FILTER_URI
...
Bug: 26074697
Change-Id: Ie1d595828912edf9d998eb2bcc4ba2f6388030b7
2015-12-08 07:39:37 +00:00
Filip Gruszczynski
d6d5f8f045
Merge "Fix freeform to recents animating window being cuttoff."
2015-12-08 02:40:40 +00:00
Filip Gruszczynski
f34a04cca9
Fix freeform to recents animating window being cuttoff.
...
The window will appear cutoff during the animation if the window was
cropped due to stack or decor bounds before the animation started. We
need to disable the cropping (both from decor and from stack bounds)
for the duration of the animation.
Unfortunately, by disabling cropping of a freeform window to the stack
bounds, we will make it appear above the docked window during the
animation (because the animation will lift the layer). To fix this, we
need to treat the docked stack like the pinned stack and assume it's
always on top for the layering purposes.
CL also includes refactoring of mSystemDecorRect and
mLastSystemDecorRect which can be moved from WindowState to
WindowStateAnimator and made private there.
Bug: 24913782
Change-Id: Idbea99ba04e9449d0563d0c02636f8b4b63087f7
2015-12-07 18:32:02 -08:00
Andreas Gampe
c373adb84d
Merge "Follow-up to Switch to the latest version of Caliper"
2015-12-08 02:30:21 +00:00
Andreas Gampe
e004a4afbb
Merge "Follow-up to Switch to the latest version of Caliper"
2015-12-08 02:29:52 +00:00
Jeff Sharkey
6b8e8500f8
Merge "APIs to obtain SharedPreferences paths."
2015-12-08 02:27:07 +00:00
Jeff Sharkey
6a6cdafaec
APIs to obtain SharedPreferences paths.
...
Needed for apps that want to migrate SharedPreferences from CE to DE
storage. Note that a device will only ever enter a CE mode with a
factory reset, so apps should only be using these APIs when they
want to migrate files to a consistent location on non-FBE devices
for simplicity.
Bug: 25503089
Change-Id: Ic846215da1617d116a048e036415ac7ad523b770
2015-12-07 19:25:25 -07:00
Andreas Gampe
0fe2de958a
Follow-up to Switch to the latest version of Caliper
...
Translate ResourcesBenchmark to work with the new version of Caliper.
Bug: 24848946
Change-Id: If4a4e5da5cd14da83d093a418147ad6d12c170cc
2015-12-07 18:25:10 -08:00
Andreas Gampe
c9d6a91cd5
Follow-up to Switch to the latest version of Caliper
...
Remove LOCAL_NO_STANDARD_LIBRARIES.
Bug: 24848946
Change-Id: I19feea042c9b4823d4979f4d951476792600edbc
2015-12-07 18:24:08 -08:00
Filip Gruszczynski
4cbc315305
Fix thumbnail header animations in freeform to recents.
...
The thumbnail header animations were constructed based on opening apps,
in this case Recents. This is obviously wrong, but used to work because
there was only one closing app in non-multi window world.
For the animation to work correctly, i.e. each thumbnail have its own
header animation, we need to correctly construct animations for either
opening apps or closing apps (depending on the transition type we are
seeing).
The CL also refactors handleAppTransition into smaller methods.
Bug: 24913782
Change-Id: I9f30a53d2f90f0628bb8c6238b2d0f35592b8f63
2015-12-07 18:19:22 -08:00
Filip Gruszczynski
3e49fec55a
Merge "Improve debugging setup for window manager package."
2015-12-08 02:08:09 +00:00
Filip Gruszczynski
0bd180d888
Improve debugging setup for window manager package.
...
This moves debug flags to a dedicated class and also provides a
mechanism to either have fine grained tags or one common tag for easier
grepping the logcat. This mimicks the approach in activity manager
package.
Change-Id: Ie8c08b9a3d8b182335ee5547ee05d21b5933db6b
2015-12-07 18:07:15 -08:00
Felipe Leme
6bbb6b9caf
Improved test cases so they handle the initial warning.
...
BUG: 25752530
Change-Id: I78cd8b534fd3aeeadad0a2cf6712432a2438ca5a
2015-12-07 17:50:15 -08:00
Prashant Malani
54909b8e6b
Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15 am: 6344cb8144
...
am: 3ebd5ceb90
* commit '3ebd5ceb90137572262efeda12cdce4b503ddded':
Add rotary encoder input source
2015-12-08 01:43:27 +00:00
Prashant Malani
3ebd5ceb90
Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15
...
am: 6344cb8144
* commit '6344cb8144647e4e49bc69cbf34a084ca7712115':
Add rotary encoder input source
2015-12-08 01:37:05 +00:00
Jeff Sharkey
e0b2f2e270
Merge "Mount storage after unlock, fix leaving emulation."
2015-12-08 01:35:28 +00:00
Prashant Malani
6344cb8144
Merge "Add rotary encoder input source" into cw-e-dev
...
am: 487f0d3d15
* commit '487f0d3d1556296ef53c449d7ec5de5a0dac1f83':
Add rotary encoder input source
2015-12-08 01:31:31 +00:00
Prashant Malani
487f0d3d15
Merge "Add rotary encoder input source" into cw-e-dev
2015-12-08 01:27:18 +00:00
Jorim Jaggi
0ca8826069
Reset recents translation when launching
...
So we don't end up with empty content after having cancelled
the drag in gesture.
Change-Id: If00c526806816df58c751cd715e0575dbb7adf17
2015-12-08 01:16:58 +00:00
Jeff Sharkey
ce14cd0141
Mount storage after unlock, fix leaving emulation.
...
Delay mounting of storage devices until after the user is unlocked,
which means any emulated storage areas will be ready for use. Track
separate per-user unlocked states for local versus system lifecycle
state.
Switch to explicitly lock or unlock user keys during boot of a
device without native FBE support. This allows us to recover when
the user has disabled emulated FBE.
Force reboot when changing FBE emulation state.
Bug: 26010607, 26027473
Change-Id: Idaf8b63e69f886ddbd848a9fab6d143a5fd10500
2015-12-07 18:02:10 -07:00
Chris Craik
62211c9b7f
Merge "Build hwui test scenes as common test code"
2015-12-08 00:55:26 +00:00
Seigo Nonaka
cfc607cf57
Introduce cache mechanism for LocaleList.
...
Setting the LocaleList to the native Paint object is not a lightweight
operation since it needs to propagate a string object to the native code
which then needs to parse it for making minikin language list.
To avoid performance regressions, cache the minikin language ID in
android.graphics.Paint and send the LocaleList with cached ID
instead of a string the next time native code is called.
BUG: 25122318
Change-Id: Ib5ce8bcff8a1c0a2b1a1c3d1868ea8be5a0e642f
2015-12-07 16:50:20 -08:00
Chris Craik
27e58b4f54
Build hwui test scenes as common test code
...
And start using them in other non-macrobench tests
Change-Id: If155b531f3c89f97491001c06d1996df527b9f85
2015-12-07 16:41:35 -08:00
Dianne Hackborn
87a845ce3b
Merge "Fix issue #25656837 : Static initialization order bug in ArrayMap leading to NPEs"
2015-12-08 00:37:43 +00:00
Fyodor Kupolov
0e57034afd
Merge "Fix locking error when a new user is created"
2015-12-08 00:35:53 +00:00
Chenjie Luo
1daf35db0f
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am: e56f7b0d1d am: bef0525c38 am: e4db3f0757
...
am: d7b61ca662
* commit 'd7b61ca6620565cad00de91284ecdfb93ddfbd50':
Check NPE beforehand instead of catching it at runtime
2015-12-08 00:02:55 +00:00
Samuel Tan
650c4af010
Merge "Add support for reading and writing double array values" am: 61c0b7cd4d am: ff8ef28e73
...
am: e769f25fa4
* commit 'e769f25fa496827bf1ba9d74518bafd40082ceb6':
Add support for reading and writing double array values
2015-12-08 00:00:45 +00:00
Paul Duffin
6a75685258
Merge "Switch to the latest version of Caliper" am: ae119af517 am: 5e2d958157
...
am: 2a56ed70b1
* commit '2a56ed70b1e40039a532e4060074d62062713fcd':
Switch to the latest version of Caliper
2015-12-07 23:58:26 +00:00
Amit Mahajan
547ef450bf
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev am: cd2cc9aa9b am: d515b124f7
...
am: 0dfeda60c0
* commit '0dfeda60c06c7bdbb4fde197e50a4c46f4024bd7':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
2015-12-07 23:51:52 +00:00
Julia Reynolds
51e3188dd9
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev am: dde5a6ef28 am: 5ff55cec79
...
am: bfa2be0f58
* commit 'bfa2be0f583e149dab8891dfe9322debaa46f6e6':
Fix radio button flash on hour change.
2015-12-07 23:50:14 +00:00
Adam Lesinski
78bdeca3f8
Merge "Specify private resource package in Android.mk"
2015-12-07 23:43:03 +00:00
Chenjie Luo
d7b61ca662
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am: e56f7b0d1d am: bef0525c38
...
am: e4db3f0757
* commit 'e4db3f0757fccdf26d98ab4295ac4828a479e8eb':
Check NPE beforehand instead of catching it at runtime
2015-12-07 23:42:07 +00:00
Samuel Tan
e769f25fa4
Merge "Add support for reading and writing double array values" am: 61c0b7cd4d
...
am: ff8ef28e73
* commit 'ff8ef28e73c0959a4993fea975d0bdefbc27a20b':
Add support for reading and writing double array values
2015-12-07 23:38:14 +00:00
Paul Duffin
2a56ed70b1
Merge "Switch to the latest version of Caliper" am: ae119af517
...
am: 5e2d958157
* commit '5e2d958157d8043d5a7aca1263af2186fdf17e6c':
Switch to the latest version of Caliper
2015-12-07 23:35:20 +00:00
Amit Mahajan
0dfeda60c0
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev am: cd2cc9aa9b
...
am: d515b124f7
* commit 'd515b124f7f966a3e4725dc6f6179ade869df636':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
2015-12-07 23:32:22 +00:00
Julia Reynolds
bfa2be0f58
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev am: dde5a6ef28
...
am: 5ff55cec79
* commit '5ff55cec79b7bda67dd3e458263ccb8e2896af30':
Fix radio button flash on hour change.
2015-12-07 23:30:22 +00:00
Chenjie Luo
e4db3f0757
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am: e56f7b0d1d
...
am: bef0525c38
* commit 'bef0525c385c95f4ff6710ad9b117429a4d5ce63':
Check NPE beforehand instead of catching it at runtime
2015-12-07 23:28:44 +00:00
Michael Wright
4d9e6190b1
Merge "Add support for locking the screen when the lid is closed"
...
am: 9dc3c36c9c
* commit '9dc3c36c9cd796d90b65543567495d910d266e4c':
Add support for locking the screen when the lid is closed
2015-12-07 23:19:53 +00:00
Samuel Tan
ff8ef28e73
Merge "Add support for reading and writing double array values"
...
am: 61c0b7cd4d
* commit '61c0b7cd4d73381a2f4e3d3836389b130b5006d9':
Add support for reading and writing double array values
2015-12-07 23:15:15 +00:00
Paul Duffin
5e2d958157
Merge "Switch to the latest version of Caliper"
...
am: ae119af517
* commit 'ae119af517fc427ead5bd6a3394b3b1f92df790d':
Switch to the latest version of Caliper
2015-12-07 23:12:48 +00:00
Fyodor Kupolov
d8327bd864
Fix locking error when a new user is created
...
Installer should not be called with mPackages lock held.
Bug: 25934378
Change-Id: I619af324d997dd1e4a2ac99171cb0e683c5713d1
2015-12-07 15:11:26 -08:00
Amit Mahajan
d515b124f7
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
...
am: cd2cc9aa9b
* commit 'cd2cc9aa9bfdc21a06ffd7049a4b4ad07bbf6886':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
2015-12-07 23:10:55 +00:00
Julia Reynolds
5ff55cec79
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev
...
am: dde5a6ef28
* commit 'dde5a6ef2846bfb6b253b0946a7b9e42a11b8348':
Fix radio button flash on hour change.
2015-12-07 23:08:01 +00:00