Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,322 Commits 3 Branches 0 Tags
b31b8eac986371cb397dfd374f558c53bbde2eef
Commit Graph

58216 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
John Reck
5cc4428bec Merge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev 
am: 9110429

* commit '9110429f0d8acac0d621d805050103fa58953fb9':
  Don't reuse LOST_SURFACE for stopped

Change-Id: Ia7c609029215da17c61eb77bd3279c077d1b7713
 2016-04-19 14:53:31 +00:00
John Reck
9110429f0d Merge "Don't reuse LOST_SURFACE for stopped" into nyc-dev 2016-04-19 14:45:16 +00:00
Alan Viverette
55f0a99076 Use adjusted popup window position when calculating best-fit 
Bug: 28194522
Bug: 28175404
Change-Id: I5685b397908f64559d0ec5fea5820bdea69f422c
 2016-04-19 10:17:00 -04:00
Alan Viverette
e24672ac18 Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev 
am: 8940a5b

* commit '8940a5b286295b164ccdd7fd5b1b04171e62e6d1':
  Revert FrameLayout.LayoutParams default gravity to -1

Change-Id: I39220f89c48a8250a8910246382909a1c401d32a
 2016-04-19 13:42:13 +00:00
Alan Viverette
8940a5b286 Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev 2016-04-19 13:36:26 +00:00
Alan Viverette
30b57b6bd2 Call OnTimeChangedListener on AM/PM change in clock-style TimePicker 
Bug: 28257554
Change-Id: I25aabac783ea2b6e68be4b6c60f0d55a4c37af26
 2016-04-19 09:29:20 -04:00
Seigo Nonaka
3675d3cd84 Delete emojis before and after ZWJ at the same time. 
Vendor may want to introduce their own ZWJ emoji sequence. To delete
them by one back space as the same behavior of Unicode emoji sequence,
use all emoji as the zwj emoji.

Bug: 28248662
Change-Id: I572dad42ee108476962d4b3fe9f3a6019cb50098
 2016-04-19 18:54:50 +09:00
Hugo Benichi
48b8d14712 Merge "Remove unused DHCP timeout event tag." into nyc-dev 
am: 6e1d1db

* commit '6e1d1dbdd4d48e7997eb0998128ccaa9f8eeee5b':
  Remove unused DHCP timeout event tag.

Change-Id: I3b5497f67819f622548d2039317fa911bd418a8c
 2016-04-19 07:12:31 +00:00
TreeHugger Robot
6e1d1dbdd4 Merge "Remove unused DHCP timeout event tag." into nyc-dev 2016-04-19 07:08:06 +00:00
Hugo Benichi
23e0e805c5 Remove unused DHCP timeout event tag. 
DHCP timeouts should not be logged at DHCPClient level but as a timeout
event in IpManager.

Bug: 28204408
Change-Id: Ia12619e3bf71102cf289cbbcdec53fd5e7e8efff
 2016-04-19 14:26:53 +09:00
Keisuke Kuroyanagi
aa44ba641e Merge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev 
am: c81b726

* commit 'c81b726ed1faf195d81d64a1af2e747d58a453df':
  Define equals and hashCode for InputDeviceIdentifier.

Change-Id: Ia99bd3ac27e0418c7534f8bf6a0a122da0a5eaf5
 2016-04-19 04:17:49 +00:00
Keisuke Kuroyanagi
c81b726ed1 Merge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev 2016-04-19 04:11:16 +00:00