Commit Graph

59152 Commits

Author SHA1 Message Date
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
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
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
c5b76587c8 Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev am: 0529197 am: e30e53b
am: 1676842

* commit '167684261147b8184e0e9c55343b1d2bf43827a6':
  Use adjusted popup window position when calculating best-fit

Change-Id: I227e2d127724f44f791af14e0bc3e2fce31af556
2016-04-19 16:53:52 +00:00
Alan Viverette
ac406894da Merge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into nyc-dev am: a98cc8b am: 644c400
am: da9eaa1

* commit 'da9eaa1f3a57cff58644824e5bf4af10752a671c':
  Call OnTimeChangedListener on AM/PM change in clock-style TimePicker

Change-Id: I89dc8476714260d0166c85e8a8010b13b90e2fd6
2016-04-19 16:53:47 +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
b424d5600c Merge "Recreate activity with correct configuration" into nyc-dev am: 5ac2da0 am: 2bf9a05
am: cdc760c

* commit 'cdc760ca3c3772b33e08fbfa8a2346701e97c14c':
  Recreate activity with correct configuration

Change-Id: I9d85a1cd4147e6b173a31eabb439164192dbc8cf
2016-04-19 16:35:19 +00:00
Andrii Kulian
cdc760ca3c Merge "Recreate activity with correct configuration" into nyc-dev am: 5ac2da0
am: 2bf9a05

* commit '2bf9a05f08f7e7bfc3f57041a9cfe3b591da4e03':
  Recreate activity with correct configuration

Change-Id: I9c5e383cbeb37c7a3321b1c441c72ef8d305b453
2016-04-19 16:28:32 +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
de5482672b Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev am: f016d3a am: b64b02f
am: ac2867b

* commit 'ac2867bed213cfefc93d6193e5c4d7fb01918bce':
  Move profile registration from bindApplication to LoadedApk

Change-Id: I7cbb81a60c190c9cd1bf7895fa667bef992eba54
2016-04-19 15:45: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
6d1ce48ff1 Merge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev am: 9110429 am: 5cc4428
am: 0f694e9

* commit '0f694e945a5b82d75b348d4ce89e2409e0131063':
  Don't reuse LOST_SURFACE for stopped

Change-Id: Ied8d4602334c13c34fab6b7779fbfdd206bf6103
2016-04-19 14:59:23 +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
49bafd00bb Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev am: 8940a5b am: e24672a
am: 6df10a7

* commit '6df10a7bd8edca050b14348c2d77e18bed87d0fa':
  Revert FrameLayout.LayoutParams default gravity to -1

Change-Id: Iabe7058e53c1086807afb6350956bd3a9b3a6a52
2016-04-19 13:48:08 +00: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
Hugo Benichi
f2450e5b5c Merge "Remove unused DHCP timeout event tag." into nyc-dev am: 6e1d1db am: 48b8d14
am: 9deef0c

* commit '9deef0ceb7668d0029ebc4bb2682edae3b1a63c3':
  Remove unused DHCP timeout event tag.

Change-Id: Ie6381a65faf36894d498ec36b231ede0f0fc0e52
2016-04-19 07:17:43 +00: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
e08c03d3ea Merge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev am: c81b726 am: aa44ba6
am: 820b721

* commit '820b721d8c31cf3b79fa400d6badf2fdb28d0369':
  Define equals and hashCode for InputDeviceIdentifier.

Change-Id: Icbd6d416837b4fbe8f37c5ebb5f5c46f7df74e7a
2016-04-19 04:22:48 +00: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
Andrii Kulian
d0ad938760 Recreate activity with correct configuration
Dialer recreates activity inside onConfigurationChange
when configuration changes significantly. Recreated
activity in this case was initialised with old base version
which resulted in incorrect configuration in split-screen.

This CL updates configuration when activity is created from
override config.

Bug: 27976063
Change-Id: I0ac002a5661154ec25f2d5aba3d44070b683ba2f
2016-04-18 20:54:20 -07:00
Pavel Zhamaitsiak
c2c39e28f3 Add wrappers for IConnectivityMetricsLogger functions
Bug: 25691077
Change-Id: I51fa34a4815fb04e33d3b02f0134e3555afc3900
2016-04-18 17:41:19 -07:00
Wale Ogunwale
b7947b49c4 Merge "Use right starting window resource in multi-window mode." into nyc-dev am: 3eefb4c am: a2ce89c
am: 55ca92d

* commit '55ca92d9a8fc0b0736eadd158ff215da52a82129':
  Use right starting window resource in multi-window mode.

Change-Id: I4c0cf10fcfd19d4a2eff35f098496e1b330221fe
2016-04-19 00:16:21 +00:00
Wale Ogunwale
a2ce89ce0d Merge "Use right starting window resource in multi-window mode." into nyc-dev
am: 3eefb4c

* commit '3eefb4c313d0269f7e8bd226bdcc2d039f9e5608':
  Use right starting window resource in multi-window mode.

Change-Id: Iae72368565a49a177dac4db22c1060f7af77f61b
2016-04-19 00:10:53 +00:00
TreeHugger Robot
3eefb4c313 Merge "Use right starting window resource in multi-window mode." into nyc-dev 2016-04-19 00:04:00 +00:00
Adam Powell
e155dcefca Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev am: de7b2ed am: 76b2c0d
am: f6267a0

* commit 'f6267a0ac1fcfdd2f83a9b20934bdf4bea9ee65f':
  Be bug-compatible with Fragment#setUserVisibleHint < N

Change-Id: I38d063ed28041d07f188250408e98c5272be2d11
2016-04-18 23:56:20 +00:00
Adam Powell
76b2c0d087 Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev
am: de7b2ed

* commit 'de7b2ed881d75cb7f21ae2199b9af68ae019becf':
  Be bug-compatible with Fragment#setUserVisibleHint < N

Change-Id: I4bf16f207710cc9b9214d4c97e260a1348c3fe19
2016-04-18 23:50:51 +00:00
Adam Lesinski
529c1ec13d Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev am: 0d47f4b am: 811c48d
am: 5b7c57d

* commit '5b7c57d53b08b29f8dc2c05a4193ec9524ce8c60':
  BatteryStats: Introduce Async external stats requests

Change-Id: I6c789ebd217f9ff15f69d6361d0e6fb3b61ff45e
2016-04-18 23:45:58 +00:00