Andreas Gampe
059db73b1f
Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c am: 3fbf298984
...
am: 36061b85ff
* commit '36061b85ff3776c4df57b1ea42c7059234585be7':
Frameworks/base: Optimize LoadedApk
Change-Id: I894cf7dc97eaa6ddaec758cb7731803e173209ca
2016-05-19 04:00:15 +00:00
Andreas Gampe
36061b85ff
Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c
...
am: 3fbf298984
* commit '3fbf29898459d3b6d9fa1680c02650fd692c32e6':
Frameworks/base: Optimize LoadedApk
Change-Id: Id57874836bd9a4e13b57cad2fdc1ff28d6a8f19c
2016-05-19 03:55:17 +00:00
Andreas Gampe
3fbf298984
Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev
...
am: 8cb3b2bb5c
* commit '8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b':
Frameworks/base: Optimize LoadedApk
Change-Id: Id11e7e9114403ab70c83601f1988f098d5728a5b
2016-05-19 03:51:39 +00:00
TreeHugger Robot
8cb3b2bb5c
Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev
2016-05-19 03:43:08 +00:00
Andreas Gampe
90e4bf8b0f
Merge "Frameworks/base: Add more systrace points" into nyc-dev am: b40bcfb6ad am: 54748384ea
...
am: f466f7bbd5
* commit 'f466f7bbd51a0bf3fe271d924e28018458d3b542':
Frameworks/base: Add more systrace points
Change-Id: If2657b0ee41ccbac74981f0500c12515858aa70f
2016-05-19 00:23:53 +00:00
Christopher Tate
d3d1a915fa
Add default lock wallpaper capability and API am: 5d99d47f39 am: 8d71edc83d
...
am: 3f42e0a3f3
* commit '3f42e0a3f3c8fb51804e9f3be40e3262ff67f2d5':
Add default lock wallpaper capability and API
Change-Id: I19ee7b66c2a90aa6764d4e4e5e1f9e041322e9d2
2016-05-19 00:19:55 +00:00
Andreas Gampe
f466f7bbd5
Merge "Frameworks/base: Add more systrace points" into nyc-dev am: b40bcfb6ad
...
am: 54748384ea
* commit '54748384ea3e001cbc97ecdf67501c8592925df7':
Frameworks/base: Add more systrace points
Change-Id: I4a3b4143a87c5e928d7149d57a899af0c0aecb0b
2016-05-19 00:19:48 +00:00
Andreas Gampe
54748384ea
Merge "Frameworks/base: Add more systrace points" into nyc-dev
...
am: b40bcfb6ad
* commit 'b40bcfb6ad3d60e5606f41c6628c133512e0538e':
Frameworks/base: Add more systrace points
Change-Id: I1ede493eaab4a86c67a992c2eb4129f81d903d1c
2016-05-19 00:14:14 +00:00
Christopher Tate
c79333d873
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562 am: c5bbf34cd9
...
am: 4b8088ea8d
* commit '4b8088ea8d2efece9c588b0ddee24ad06d53a28b':
API feedback: rename JobInfo methods for clarity
Change-Id: I2ee283a476e1bc706509016c80821e1f9bc1020b
2016-05-19 00:13:17 +00:00
Christopher Tate
3f42e0a3f3
Add default lock wallpaper capability and API am: 5d99d47f39
...
am: 8d71edc83d
* commit '8d71edc83de3c695f27967dd3378306654b9953c':
Add default lock wallpaper capability and API
Change-Id: I676d2ab9526f9e2e47f79a73cbb680673ded50f0
2016-05-19 00:13:04 +00:00
TreeHugger Robot
b40bcfb6ad
Merge "Frameworks/base: Add more systrace points" into nyc-dev
2016-05-19 00:09:09 +00:00
Chris Tate
4b8088ea8d
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev am: b100777562
...
am: c5bbf34cd9
* commit 'c5bbf34cd940f8fa62662bec3a71f7160983dc06':
API feedback: rename JobInfo methods for clarity
Change-Id: I4b97e2f581ce0c36d1385a510916b4ad3bc4e1af
2016-05-19 00:03:45 +00:00
Christopher Tate
8d71edc83d
Add default lock wallpaper capability and API
...
am: 5d99d47f39
* commit '5d99d47f39d741ebe4a1ede53affc8c6bd198b2f':
Add default lock wallpaper capability and API
Change-Id: Ib617878c13d4a6530a12365199742fa7ffb5d590
2016-05-19 00:02:47 +00:00
Christopher Tate
c5bbf34cd9
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev
...
am: b100777562
* commit 'b1007775622f1814c87eef3ee5a325f606adb26c':
API feedback: rename JobInfo methods for clarity
Change-Id: I4fb08a73a64233e9d016f520f08944e22ec5ccd3
2016-05-18 23:58:03 +00:00
Christopher Tate
5d99d47f39
Add default lock wallpaper capability and API
...
If present, the system property "ro.config.lock_wallpaper" provides a
filesystem path to a decodeable image file to use as the system's
out-of-the-box lock wallpaper imagery. In the absence of this
system property, or if the indicated file is absent or unreadable,
then the new framework resource
com.android.internal.R.drawable.default_lock_wallpaper is consulted to
locate a usable asset. This mechanism parallels the existing one for
the default system wallpaper.
By default there is no specific lock wallpaper asset; the resource is
defined to be @null in the standard config.xml file. A product that
wants to define such a factory-default lock-only wallpaper image
will provide the asset as part of its framework resource overlay.
Bug 27828056
Change-Id: Iebf3706222370d0a0a4baf88d71a59ead07a25c7
2016-05-18 23:57:46 +00:00
Chris Tate
b100777562
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev
2016-05-18 23:50:14 +00:00
Andreas Gampe
a8a58ffdee
Frameworks/base: Optimize LoadedApk
...
Preallocate storage lists and avoid TextUtils and its string
builder for a common code path.
Optimize list join helper to not have a check in the loop.
Bug: 28801010
Change-Id: Iafc582031f973d718252b34bcda6405a77425628
2016-05-18 15:48:12 -07:00
Andreas Gampe
4c8e542f68
Frameworks/base: Add more systrace points
...
Add more systrace points for application startup.
Bug: 28625993
Change-Id: I76dca9e842fb43f1b85981ef94582074d31528c8
2016-05-18 15:43:45 -07:00
Robert Carr
2fd8c219b2
Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb am: 9782de1ffd
...
am: 3b0a049b11
* commit '3b0a049b1175189c6a6b2f2d0dca05f925ec3b67':
Fixes for ending PiP animation.
Change-Id: I0cd5217e724182d979c08cc367c24d63dec3a7cc
2016-05-18 22:16:00 +00:00
Robert Carr
3b0a049b11
Merge "Fixes for ending PiP animation." into nyc-dev am: bc9edc7ccb
...
am: 9782de1ffd
* commit '9782de1ffd344d1a8250b8ead4a13eee16c20cde':
Fixes for ending PiP animation.
Change-Id: I34acea654389eedd7d3b6f6e7ec2f239cccf2ae6
2016-05-18 22:11:10 +00:00
Robert Carr
9782de1ffd
Merge "Fixes for ending PiP animation." into nyc-dev
...
am: bc9edc7ccb
* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
Fixes for ending PiP animation.
Change-Id: If885965536859bc2433d14d4993010871c171360
2016-05-18 22:05:30 +00:00
Robert Carr
cd1a9642e8
Merge "Fixes for ending PiP animation." into nyc-dev
...
am: bc9edc7ccb
* commit 'bc9edc7ccb4d876bfc5c706fbb64dab9a2768b52':
Fixes for ending PiP animation.
Change-Id: I58d62d0d0dd964264395b545bf4e3093a0ffaf88
2016-05-18 22:05:28 +00:00
Winson
81100ae084
Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42 am: 6e2ee9e382
...
am: ea9220988e
* commit 'ea9220988e8c88d258a5cb99e2687ee03f90cf55':
Mark occluded home stack as invisible.
Change-Id: I8f9f1a92e198f7db97d7c3e1b93ff77a83fdbc5c
2016-05-18 22:01:00 +00:00
TreeHugger Robot
bc9edc7ccb
Merge "Fixes for ending PiP animation." into nyc-dev
2016-05-18 21:57:23 +00:00
Winson Chung
ea9220988e
Merge "Mark occluded home stack as invisible." into nyc-dev am: 32b54f2e42
...
am: 6e2ee9e382
* commit '6e2ee9e382dd86340d5242fe04a623b9cda10f6e':
Mark occluded home stack as invisible.
Change-Id: I1762cf46b675fe2c5151332a53139e95d676cb01
2016-05-18 21:56:10 +00:00
Winson
98fdcf308f
Merge "Mark occluded home stack as invisible." into nyc-dev
...
am: 32b54f2e42
* commit '32b54f2e42c4ff793c418c29c0ce9ef0be2a4a16':
Mark occluded home stack as invisible.
Change-Id: Iae4279835f345b2b294acca20760634ba031f0bd
2016-05-18 21:50:44 +00:00
Winson
6e2ee9e382
Merge "Mark occluded home stack as invisible." into nyc-dev
...
am: 32b54f2e42
* commit '32b54f2e42c4ff793c418c29c0ce9ef0be2a4a16':
Mark occluded home stack as invisible.
Change-Id: Iaa68bb7c93ffd8bcfc9af3e66fd7fced7787a671
2016-05-18 21:49:17 +00:00
Winson Chung
32b54f2e42
Merge "Mark occluded home stack as invisible." into nyc-dev
2016-05-18 21:42:57 +00:00
Christopher Tate
a9b4f3f628
API feedback: rename JobInfo methods for clarity
...
Bug 28773330
Change-Id: I081fa225380a1966010d41020200fb3b9549a195
2016-05-18 13:59:16 -07:00
Robert Carr
c7294607fc
Fixes for ending PiP animation.
...
During the PiP animation, we have two basic requirements:
1. We need to scale windows to the pinned stack bounds.
2. We need to halt resize and movement notifications to the client.
As we end the animation, we need to disable these states at differing
times. First we need to deliver a final resize and movement notification
to the client for it's new position. However, Surfaces may not
immediately resize (in particular in the case of child windows,
it may be some time!), furthermore Surfaces may resize at different
times so we need to persist scaling on a Surface by Surface
basis after reenabling resize notifications.
Bug: 28559097
Change-Id: I6d52a3e213e08a34f4c0eea892b2a84cd4c20e18
2016-05-18 13:24:41 -07:00
Sudheer Shanka
773cbc0da1
Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 am: db9d529499
...
am: d412dfc2a8
* commit 'd412dfc2a80166038e8ea17759dfdfc1b03b419d':
Update RestrictedLockUtils to use UM.getUserRestrictionSource.
Change-Id: I021b42322aed96471559574aa7d6af63ced784b4
2016-05-18 17:23:31 +00:00
Tony Mak
d412dfc2a8
Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55
...
am: db9d529499
* commit 'db9d529499cc635c5ce3d0a4d5b44f2211afaef6':
Update RestrictedLockUtils to use UM.getUserRestrictionSource.
Change-Id: I12805ef5c1a7039ccad07e31f84231cc703dd470
2016-05-18 17:18:36 +00:00
Sudheer Shanka
db9d529499
Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev
...
am: 0d902adbbc
* commit '0d902adbbc729f87f94fd70d9a6331e551108bc0':
Update RestrictedLockUtils to use UM.getUserRestrictionSource.
Change-Id: Iaad04447c2fffd0f6b80c22bfea576e5d2b28856
2016-05-18 17:14:29 +00:00
Sudheer Shanka
6c505ecdd6
Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev
...
am: 0d902adbbc
* commit '0d902adbbc729f87f94fd70d9a6331e551108bc0':
Update RestrictedLockUtils to use UM.getUserRestrictionSource.
Change-Id: I2a0a71595b2af94d9806386877ca510c0cee3271
2016-05-18 17:14:25 +00:00
TreeHugger Robot
0d902adbbc
Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev
2016-05-18 17:09:46 +00:00
Yohei Yukawa
af15c8bcae
Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681
...
am: bf4c8f730b
* commit 'bf4c8f730b167e5ee65ed7c59dfa1d7867b63fcc':
Move LocaleList to avoid layering violation.
Change-Id: I78fee5269f7428e34b196573575784fc15cb1372
2016-05-18 02:25:10 +00:00
Yohei Yukawa
bf4c8f730b
Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13
...
am: ddaf3f4681
* commit 'ddaf3f468195e5aa47617317c08e9e2c35bcfeee':
Move LocaleList to avoid layering violation.
Change-Id: I7dbe5c3d552a7350ab61c929f431e2a3cffdee5b
2016-05-18 02:22:07 +00:00
Yohei Yukawa
ddaf3f4681
Merge "Move LocaleList to avoid layering violation." into nyc-dev
...
am: 31884efd13
* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
Move LocaleList to avoid layering violation.
Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
2016-05-18 02:18:38 +00:00
Yohei Yukawa
13fa6b7c48
Merge "Move LocaleList to avoid layering violation." into nyc-dev
...
am: 31884efd13
* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
Move LocaleList to avoid layering violation.
Change-Id: I45e9b7e834d2c5e515eb6c60885296358e7d786e
2016-05-18 02:18:29 +00:00
Yohei Yukawa
31884efd13
Merge "Move LocaleList to avoid layering violation." into nyc-dev
2016-05-18 02:14:26 +00:00
Andrii Kulian
5417ca597a
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev am: 47aa3f61ac
...
am: 06a325c3e3
* commit '06a325c3e3b1925c2208892f13570f08e180b12c':
DO NOT MERGE Hide decor caption APIs
Change-Id: I6eb614317b520e5a902dbc7533f3f08b68ed4861
2016-05-18 01:00:50 +00:00
Andrii Kulian
06a325c3e3
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
...
am: 47aa3f61ac
* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
DO NOT MERGE Hide decor caption APIs
Change-Id: I7654435d1b251d1349125beb0b5d4a35c81855b1
2016-05-18 00:55:12 +00:00
Andrii Kulian
88a2a7be72
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
...
am: 47aa3f61ac
* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
DO NOT MERGE Hide decor caption APIs
Change-Id: I588355b4e5ac95e4f872bf06d77fd3d3346cddac
2016-05-18 00:55:12 +00:00
Andrii Kulian
47aa3f61ac
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
2016-05-18 00:51:17 +00:00
Winson
529c8e4cf2
Mark occluded home stack as invisible.
...
- The home stack is still visible when a translucent activity (like
dialer) is on top, which caused us to use the logic path that just
tries to launch the next task. However, that path does not reload
the stack state (since the activity stack generally doesn’t change
while Recents is visible) so it was always launching the already top
activity. The new check ensures that we start the activity anew
as if it was coming from an occluding app.
Bug: 28767764
Change-Id: Iec0fdc0957e5070cec532c5de5cba3454c906a3b
2016-05-17 17:47:40 -07:00
Adrian Roos
d7c7d1466a
Merge "Adjust Notification APIs per API council" into nyc-dev am: 718ba309cf am: 3a0f4f4b64
...
am: 16e54ef2ff
* commit '16e54ef2ffb49fe090a8059bce6494e9fba2d4fb':
Adjust Notification APIs per API council
Change-Id: Iad10ffc7346eb3b2d3d8f9b8478f2e67bc6c641c
2016-05-18 00:21:12 +00:00
Adrian Roos
16e54ef2ff
Merge "Adjust Notification APIs per API council" into nyc-dev am: 718ba309cf
...
am: 3a0f4f4b64
* commit '3a0f4f4b642087138b59a18612be437376652c92':
Adjust Notification APIs per API council
Change-Id: I20a1e1a542f48532be1b9d71bb5fb2eb0498b395
2016-05-18 00:17:47 +00:00
Adrian Roos
3a0f4f4b64
Merge "Adjust Notification APIs per API council" into nyc-dev
...
am: 718ba309cf
* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
Adjust Notification APIs per API council
Change-Id: I282bb2b6e4718f7b1afb3eb418a8d37deaa457b0
2016-05-18 00:13:14 +00:00
Adrian Roos
6cb72ee2eb
Merge "Adjust Notification APIs per API council" into nyc-dev
...
am: 718ba309cf
* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
Adjust Notification APIs per API council
Change-Id: Ic85fdd92c691f7b30cd73a9e1a7f147fcf55c3c5
2016-05-18 00:13:07 +00:00
TreeHugger Robot
718ba309cf
Merge "Adjust Notification APIs per API council" into nyc-dev
2016-05-18 00:06:30 +00:00