Winson
174e1aceb0
Merge changes Ie3125ec8,Ifa149322,Ifa2ed84a into nyc-dev
...
am: b77d0bcc84
* commit 'b77d0bcc840fbda8372c4042a1f2e83df8e12a83':
Tweaking accessibility actions for dock divider.
Ensure that the drag view is not dimmed.
Disallowing scrim activity from setting TaskDescription.
Change-Id: I535255c12415caf02e30885fb4efc0efd04cdbc6
2016-04-19 23:09:21 +00:00
Winson Chung
b77d0bcc84
Merge changes Ie3125ec8,Ifa149322,Ifa2ed84a into nyc-dev
...
* changes:
Tweaking accessibility actions for dock divider.
Ensure that the drag view is not dimmed.
Disallowing scrim activity from setting TaskDescription.
2016-04-19 23:01:20 +00:00
Doris Liu
86ac81b6ba
Merge "Fix pause/resume for AnimatorSet" into nyc-dev
...
am: dd67b0d
* commit 'dd67b0d52521bb828bc31732fe3ac8b786a19cce':
Fix pause/resume for AnimatorSet
Change-Id: I235c869ce54fdf789898f8663a92fd22a4872600
2016-04-19 22:24:27 +00:00
Robert Carr
1b72363846
Merge "Force windows to be scalable during pinned animation." into nyc-dev
...
am: 4e9a9df
* commit '4e9a9dfb67ebc48028b1613a03144101d94f7d92':
Force windows to be scalable during pinned animation.
Change-Id: I772d120442ed82c55c71fbf5ce841735d7a14cc5
2016-04-19 22:17:16 +00:00
Adrian Roos
30110b80f7
Merge "Fix unprotected StatusBarManagerService calls" into nyc-dev
...
am: 3dd5948
* commit '3dd59487cc5f01f38e1e5068ce9257a40473baba':
Fix unprotected StatusBarManagerService calls
Change-Id: I3afc4a7c1ed8e1f73dcd4c4c0c00a3eb40ac3ce1
2016-04-19 22:17:11 +00:00
Doris Liu
dd67b0d525
Merge "Fix pause/resume for AnimatorSet" into nyc-dev
2016-04-19 22:14:37 +00:00
Rob Carr
4e9a9dfb67
Merge "Force windows to be scalable during pinned animation." into nyc-dev
2016-04-19 22:11:02 +00:00
Adrian Roos
3dd59487cc
Merge "Fix unprotected StatusBarManagerService calls" into nyc-dev
2016-04-19 22:05:44 +00:00
Kenny Guy
75d4db49d9
Merge "Add test method to remove admins." into nyc-dev
...
am: 3c5ceae
* commit '3c5ceae1d35de476644e4d5db5978149311e63e6':
Add test method to remove admins.
Change-Id: Icff7bb03ca1c2bc987d46450a2dd2f49edcfb60b
2016-04-19 21:53:23 +00:00
Amith Yamasani
3c5ceae1d3
Merge "Add test method to remove admins." into nyc-dev
2016-04-19 21:46:41 +00:00
Winson
ce9630da86
Tweaking accessibility actions for dock divider.
...
- Adding tl_full/70%/50%/30%/rb_full
Bug: 27724715
Change-Id: Ie3125ec81e6463696cf56640c6b86f9cfcbda945
2016-04-19 14:46:24 -07:00
Chris Craik
82b735bfb3
Merge "Document startService cost" into nyc-dev
...
am: 6ed4e35
* commit '6ed4e35e49fb9d1e485f53b4ce309865d98a6058':
Document startService cost
Change-Id: Iee9832e83570b01c98b72ce46a500b61b3184036
2016-04-19 21:19:57 +00:00
Chris Craik
6ed4e35e49
Merge "Document startService cost" into nyc-dev
2016-04-19 21:08:14 +00:00
Joe Onorato
1f3b7e1529
Merge "Add the wall clock time to dumpsys cpuinfo so it\'s easier to correlate with the logs." into nyc-dev
...
am: 6bf86d5
* commit '6bf86d5e5ca73bceeb4f46771eabdc946ddc56e1':
Add the wall clock time to dumpsys cpuinfo so it's easier to correlate with the logs.
Change-Id: Ib051ed05ac47a05312e82d9535cc6ac4f39a8058
2016-04-19 21:01:07 +00:00
Joe Onorato
2d7e674608
Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev
...
am: 4c4afed
* commit '4c4afedfc5134558c1f674c1fc8f41260e07bdeb':
Consolidate the HealthStats UI to only use milliseconds.
Change-Id: I875b82483386bce75b35304970b6020d1da2ed5d
2016-04-19 21:00:52 +00:00
Joe Onorato
6bf86d5e5c
Merge "Add the wall clock time to dumpsys cpuinfo so it's easier to correlate with the logs." into nyc-dev
2016-04-19 20:49:43 +00:00
Joe Onorato
4c4afedfc5
Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev
2016-04-19 20:49:20 +00:00
Todd Kennedy
64dc4813c9
Merge "Always perform has code check" into nyc-dev
...
am: 069ed70
* commit '069ed7003b3de1f87d28413cc2debc9042386d3c':
Always perform has code check
Change-Id: Ic8b5ac47631bcb26d27b88eceb389616eec02f85
2016-04-19 19:54:20 +00:00
Robert Carr
1ca6a33f36
Force windows to be scalable during pinned animation.
...
We resize windows at the beginning of the pinned stack
animation when animating to a larger size, and so for some
duration a resize will be pending. We need to force the window
out of SCALING_MODE_FREEZE so we can animate during this period.
Bug: 27891386
Change-Id: I5cff599ed67f2c179e938662b6f0d99bd790aaba
2016-04-19 12:47:18 -07:00
Todd Kennedy
069ed7003b
Merge "Always perform has code check" into nyc-dev
2016-04-19 19:47:00 +00:00
Todd Kennedy
f720a9d91e
Always perform has code check
...
Move code checking from the package parser and into the block
where we implement policy.
Bug: 28132476
Change-Id: Ie5cacacbf80289ff8d85acc5b57e58ea7216859c
2016-04-19 12:40:54 -07:00
Robin Lee
e7c7d77f6f
Merge "Move UidRange aidl declaration to system/netd" into nyc-dev
...
am: c618468
* commit 'c6184685d8f9b08abf73f83778ca129bb5c9c51d':
Move UidRange aidl declaration to system/netd
Change-Id: I708ee20cfef47252a4b3ebecd1b2d46886326af4
2016-04-19 19:28:07 +00:00
Robin Lee
c6184685d8
Merge "Move UidRange aidl declaration to system/netd" into nyc-dev
2016-04-19 19:19:43 +00:00
Kenny Guy
38dcca51a7
Add test method to remove admins.
...
Add test method to remove admins that declare
FLAG_TEST_APP without informing them.
The method will also remove the device and profile
owner status of the admin.
Bug: 28027468
Change-Id: Idb4d3299a9c6595c94bfb424546cd8a384131835
2016-04-19 20:10:56 +01:00
Seigo Nonaka
c94fd1664e
Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev
...
am: 7ecd767
* commit '7ecd7671b75b2ae7c4d20928722b4a1d41bd62ff':
Delete emojis before and after ZWJ at the same time.
Change-Id: If877cde7549f0bd0e56c7cbd707e360c8df012fd
2016-04-19 18:36:15 +00:00
Raph Levien
7ecd7671b7
Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev
2016-04-19 18:31:05 +00:00
Joe Onorato
d2bc2ba778
Add the wall clock time to dumpsys cpuinfo so it's easier to correlate with the logs.
...
Bug: 28113068
Change-Id: Ifa90192b0aa3f57ba6928f38199beb5b56bca7e6
2016-04-19 11:27:11 -07:00
Joe Onorato
bee44ae8e5
Consolidate the HealthStats UI to only use milliseconds.
...
BatteryStats uses a mix of microseconds and milliseconds, and keeping
which one is which straight is difficult. The internal bookkeeping
is left using us where it already does, for the extra precision. But
having the API be mixed will only make it harder for developers, and
lead them to make the same mistake that I did in the API where I
missed some conversions.
Bug: 28197858
Change-Id: I99114bae259b9bdd47ce5c22e724d87bbd63336d
2016-04-19 11:27:05 -07:00
Dianne Hackborn
bf7e134316
Merge "Work on issue #28221912 : Starting service as foreground might..." into nyc-dev
...
am: 9c211a3
* commit '9c211a339689a2e54da3315ccdbf22add472c76a':
Work on issue #28221912 : Starting service as foreground might...
Change-Id: I9f94c6adca6891ac0e43b83f45001092536c7ee9
2016-04-19 18:18:38 +00:00
Dianne Hackborn
9c211a3396
Merge "Work on issue #28221912 : Starting service as foreground might..." into nyc-dev
2016-04-19 18:10:28 +00:00
Pavel Zhamaitsiak
818ed108aa
Merge "Add wrappers for IConnectivityMetricsLogger functions" into nyc-dev
...
am: 6e08a62
* commit '6e08a629c4ed61c4cb1132576422189e03bda965':
Add wrappers for IConnectivityMetricsLogger functions
Change-Id: I6668a074c83fc73ee2c788b078264888ff5e7c00
2016-04-19 17:50:42 +00:00
Bo Liu
39e562df80
Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev
...
am: 57b615c
* commit '57b615c3fd3f920523b2dd34041cf1e135f5c172':
Expose DisplayListCanvas.drawGLFunctor to webview
Change-Id: I715aa5644d405a8e484ddd633e01f5f0336b99b7
2016-04-19 17:44:19 +00:00
Pavel Zhamaitsiak
6e08a629c4
Merge "Add wrappers for IConnectivityMetricsLogger functions" into nyc-dev
2016-04-19 17:41:42 +00:00
Bo Liu
57b615c3fd
Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev
2016-04-19 17:39:17 +00:00
Samuel Tan
17804abf32
Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev
...
am: e749cd3
* commit 'e749cd3b15bb14e6dc4ff2724ec1ed56ba269b4c':
StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize
Change-Id: I6c1091f9374d759da67a72703e1f688b8cd1f13d
2016-04-19 17:35:10 +00:00
Samuel Tan
e749cd3b15
Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev
2016-04-19 17:25:33 +00:00
Jeff Sharkey
4dc65d31a1
Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev
...
am: 89fa73f
* commit '89fa73fd7abe0f87634d2914163a8fc79ba2f738':
Unlock should always wait for pending PRE_BOOT.
Change-Id: I0043da18fabef2c5c916a2e5562d9e613c2b057c
2016-04-19 17:16:25 +00:00
Jeff Sharkey
091fba4449
Merge "Disable "defusable" logging for now." into nyc-dev
...
am: d3a25ad
* commit 'd3a25ad4b98d717673cb3a81ae1344ff90107d8c':
Disable "defusable" logging for now.
Change-Id: Ibd04f5de04ada226a210414755de4f80d9d2e889
2016-04-19 17:16:22 +00:00
Jeff Sharkey
89fa73fd7a
Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev
2016-04-19 17:11:20 +00:00
Jeff Sharkey
d3a25ad4b9
Merge "Disable "defusable" logging for now." into nyc-dev
2016-04-19 17:10:56 +00:00
Siyamed Sinir
677736bd88
Merge "Request re-layout after setText if layout width is 0" into nyc-dev
...
am: d01e6f9
* commit 'd01e6f90832e7b7d55218836aae227452080f9b8':
Request re-layout after setText if layout width is 0
Change-Id: I1151616a69aebada2f2738ee248734c9352b8f74
2016-04-19 17:10:15 +00:00
Siyamed Sinir
d01e6f9083
Merge "Request re-layout after setText if layout width is 0" into nyc-dev
2016-04-19 17:00:15 +00:00
Alan Viverette
e30e53bd5f
Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev
...
am: 0529197
* commit '0529197e9df8837ac63b011937391ff29426e6b5':
Use adjusted popup window position when calculating best-fit
Change-Id: I92ffd7cd81e20ff97fc44ed98fba3a00a446d558
2016-04-19 16:47:20 +00:00
Alan Viverette
644c4006ea
Merge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into nyc-dev
...
am: a98cc8b
* commit 'a98cc8beb9af5678320b6fae8507dbe2da2c74dc':
Call OnTimeChangedListener on AM/PM change in clock-style TimePicker
Change-Id: I3f0ab3f7f6d4cf62e251b0f2b6f2370270ae5fb3
2016-04-19 16:47:18 +00:00
Alan Viverette
0529197e9d
Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev
2016-04-19 16:39:15 +00:00
Alan Viverette
a98cc8beb9
Merge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into nyc-dev
2016-04-19 16:39:09 +00:00
Andrii Kulian
9df97927ab
Merge "Recreate activity with correct configuration" into nyc-dev
...
am: 5ac2da0
* commit '5ac2da04c1321e8620fc85afae7a168c01ce218b':
Recreate activity with correct configuration
Change-Id: I0ef3b390763eb10028ce0ad76d2ead9655112926
2016-04-19 16:25:24 +00:00
Andrii Kulian
5ac2da04c1
Merge "Recreate activity with correct configuration" into nyc-dev
2016-04-19 16:19:05 +00:00
Calin Juravle
b64b02fa9a
Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev
...
am: f016d3a
* commit 'f016d3aef7711bf6703d9ef053c40afabdaf71a9':
Move profile registration from bindApplication to LoadedApk
Change-Id: I1aba5c20a14e701da089388f4455cbb76762141b
2016-04-19 15:38:46 +00:00
TreeHugger Robot
f016d3aef7
Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev
2016-04-19 15:29:19 +00:00