Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,084 Commits 3 Branches 0 Tags
9b23400b05d646a4023bf6d039ddb03be3501ac3
Commit Graph

59196 Commits

Author SHA1 Message Date
Jorim Jaggi
9b23400b05 Merge "Fixes for resize thread" into nyc-dev am: 13219992a0 am: 47606dc20f 
am: b3150d580e

* commit 'b3150d580e869fe85e3aec1b6417a9161acc7400':
  Fixes for resize thread

Change-Id: I6c9d9151edd94b18792875cd25f70f816053e326
 2016-04-20 00:18:57 +00:00
Jorim Jaggi
b3150d580e Merge "Fixes for resize thread" into nyc-dev am: 13219992a0 
am: 47606dc20f

* commit '47606dc20fb12e6fcf9c889d48b1b78b6790561e':
  Fixes for resize thread

Change-Id: I683fcd212936beb48808d016f8cf87a8c5635925
 2016-04-20 00:16:45 +00:00
Jorim Jaggi
13219992a0 Merge "Fixes for resize thread" into nyc-dev 2016-04-20 00:07:54 +00:00
Doris Liu
6e09efdb3f Merge "Merge "Fix pause/resume for AnimatorSet" into nyc-dev am: dd67b0d am: 86ac81b" into nyc-mr1-dev-plus-aosp 
am: 36b3ef5

* commit '36b3ef56ee20be40a4b1a66beac2f1cb15151ac3':
  Fix pause/resume for AnimatorSet

Change-Id: I42b7ce2033e82f81bbbd07b61f454f86d77514ae
 2016-04-19 22:39:30 +00:00
Robert Carr
d51e2981a2 Merge "Force windows to be scalable during pinned animation." into nyc-dev am: 4e9a9df am: 1b72363 
am: 465ff1f

* commit '465ff1f9e61953eb57ab2fe3ff3405abebc79628':
  Force windows to be scalable during pinned animation.

Change-Id: I49a8373aad59842e28847f36511e662c7087d4b3
 2016-04-19 22:28: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
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
Kenny Guy
ed4ae966a4 Merge "Add test method to remove admins." into nyc-dev am: 3c5ceae am: 1ac021e 
am: 28a12ba

* commit '28a12ba5f6313d489d4b8e3c9dd6b3e06da6624e':
  Add test method to remove admins.

Change-Id: I32d81f5cb92a680f98446a8b735f6d2b0f501f64
 2016-04-19 22:00:40 +00:00
Amith Yamasani
28a12ba5f6 Merge "Add test method to remove admins." into nyc-dev am: 3c5ceae 
am: 1ac021e

* commit '1ac021e6245f7a9eb2aaf208bbb506541f6dd8ab':
  Add test method to remove admins.

Change-Id: I8f59c19521ea371cf9ef5a29c1dbfa3187a548ee
 2016-04-19 21:57:19 +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
Jorim Jaggi
0d6222d96d Fixes for resize thread 
- Make sure to draw navigation bar/status bar background before the
main render node. This is to avoid any flickering when entering
resizing mode, so you rather overdraw than underdraw.
- Draw the first frame from the main thread directly to increase
chance that all drawing commands are processing within a single
frame.

Bug: 27864358
Bug: 28003586
Change-Id: I033f57cdbcb2c16ea93134c041095a415d5c25b4
 2016-04-19 14:41:11 -07:00
Chris Craik
50828c790a Merge "Document startService cost" into nyc-dev am: 6ed4e35 am: 82b735b 
am: 90f1a4c

* commit '90f1a4c60792898feaa9c5d52dfc1f59e61eee27':
  Document startService cost

Change-Id: I586cb1a40393dc2e4285492369d7117fda86ba7b
 2016-04-19 21:26:36 +00: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
Joe Onorato
a5d2056f25 Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev am: 4c4afed am: 6ee19e4 
am: 67288c5

* commit '67288c5b6f05e18e85dd9a520f273d311952276f':
  Consolidate the HealthStats UI to only use milliseconds.

Change-Id: I8ea14a4502f124daee32c0ef92130200431f04e7
 2016-04-19 21:10:42 +00:00
Chris Craik
6ed4e35e49 Merge "Document startService cost" into nyc-dev 2016-04-19 21:08:14 +00:00
Joe Onorato
67288c5b6f Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev am: 4c4afed 
am: 6ee19e4

* commit '6ee19e49346eea5d096933611586ab2b9d86e86d':
  Consolidate the HealthStats UI to only use milliseconds.

Change-Id: Idf18eb11cff73c174072b4ab831bc35b5cb467de
 2016-04-19 21:06:29 +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
4c4afedfc5 Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev 2016-04-19 20:49:20 +00:00
Todd Kennedy
62347f17f3 Merge "Always perform has code check" into nyc-dev am: 069ed70 am: 64dc481 
am: a0906c8

* commit 'a0906c8d9e36ac79d1f802ec0cf6dd82aa39240c':
  Always perform has code check

Change-Id: I6e1afb2c727cf3944fb65d8b15f49de272bde362
 2016-04-19 20:01:00 +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
e1ee098ab2 Merge "Move UidRange aidl declaration to system/netd" into nyc-dev am: c618468 am: e7c7d77 
am: 5d16439

* commit '5d1643989218a132f570c8d002213089a33ef5ce':
  Move UidRange aidl declaration to system/netd

Change-Id: I899574d6e8ec88049a8bb72e8dc451ebd407bc3a
 2016-04-19 19:34:50 +00: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
c2c0786787 Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev am: 7ecd767 am: 3de469a 
am: e519b51

* commit 'e519b51d1db816c454bd73ded90ae6b9ea32de4e':
  Delete emojis before and after ZWJ at the same time.

Change-Id: I2426af56d5659c3e6c67d82cbd449815bb7d0e14
 2016-04-19 18:44:59 +00:00
Raph Levien
e519b51d1d Merge "Delete emojis before and after ZWJ at the same time." into nyc-dev am: 7ecd767 
am: 3de469a

* commit '3de469a68750e8b9b455a4a5bd3a78ad2ecd4af0':
  Delete emojis before and after ZWJ at the same time.

Change-Id: I826f62aae6baaffea722d8c853cc1d01c8ff41f5
 2016-04-19 18:39:52 +00: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
Dianne Hackborn
2f9a2fe046 Merge "Work on issue #28221912: Starting service as foreground might..." into nyc-dev am: 9c211a3 am: bf7e134 
am: dbc4e4f

* commit 'dbc4e4fa83d6fb460165be22798bbf04422be9c2':
  Work on issue #28221912: Starting service as foreground might...

Change-Id: I243f791317962d2ab9eea156b0f146f6fcc96fcb
 2016-04-19 18:29:38 +00: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
ea7984231f Merge "Add wrappers for IConnectivityMetricsLogger functions" into nyc-dev am: 6e08a62 am: d42b900 
am: f060af8

* commit 'f060af887bf516fe11b979b1f822f9e559bdc6eb':
  Add wrappers for IConnectivityMetricsLogger functions

Change-Id: I54ba063dc51e5b27a60c8bbe9c3a6bcefa0cda51
 2016-04-19 18:01:29 +00:00
Bo Liu
06a63a753e Merge "Expose DisplayListCanvas.drawGLFunctor to webview" into nyc-dev am: 57b615c am: 39e562d 
am: 49b608a

* commit '49b608a95f2aceef9421d91acf3dd40fac5cc8cb':
  Expose DisplayListCanvas.drawGLFunctor to webview

Change-Id: I91f5ac6636cd3220196266a1a357df4087f1c4f3
 2016-04-19 17:54:00 +00:00
Pavel Zhamaitsiak
f060af887b Merge "Add wrappers for IConnectivityMetricsLogger functions" into nyc-dev am: 6e08a62 
am: d42b900

* commit 'd42b900e303836f5db7c772d70bbe8241ee01ce3':
  Add wrappers for IConnectivityMetricsLogger functions

Change-Id: I73c9a0fd6e3c048c0909fe35a189581bf50795d7
 2016-04-19 17:53:56 +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
Jeff Sharkey
b3bf559a77 Merge "Disable "defusable" logging for now." into nyc-dev am: d3a25ad am: ea54db6 
am: df6d014

* commit 'df6d01463adf4b96bdd4dc317ac7b479bb2bc0d4':
  Disable "defusable" logging for now.

Change-Id: I6458200608363a58c8a769fdcc4d309bb4e8de91
 2016-04-19 17:28:49 +00:00
Jeff Sharkey
df6d01463a Merge "Disable "defusable" logging for now." into nyc-dev am: d3a25ad 
am: ea54db6

* commit 'ea54db6b48dea0c13f6b5a32dbc9fa66faf6206f':
  Disable "defusable" logging for now.

Change-Id: Ie1bb02c88e7cea2db99da9c06ae2778363f42f1b
 2016-04-19 17:22:34 +00:00
Siyamed Sinir
d200f61031 Merge "Request re-layout after setText if layout width is 0" into nyc-dev am: d01e6f9 am: 5ce80a0 
am: a4c7dcd

* commit 'a4c7dcdde918ed6b30d93296578f3284c88a2957':
  Request re-layout after setText if layout width is 0

Change-Id: I0542adea173c486e4644f1e47e4a6fa33e66c796
 2016-04-19 17:19:36 +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
Siyamed Sinir
a4c7dcdde9 Merge "Request re-layout after setText if layout width is 0" into nyc-dev am: d01e6f9 
am: 5ce80a0

* commit '5ce80a03e7f86e0aae141b2340d13439c65cbf3b':
  Request re-layout after setText if layout width is 0

Change-Id: Ic7dd362f57eb10df8cca6fc8b6720cc0f45fc2f1
 2016-04-19 17:13:18 +00:00