Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,099 Commits 3 Branches 0 Tags
0eda86c207fd0c8eca4aa4400f57301ddacbaae5
Commit Graph

58801 Commits

Author SHA1 Message Date
Robert Carr
45c6eb2164 Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 
am: b9d2502eac

* commit 'b9d2502eac428ee8021bcfa43977479032a88bfc':
  Prepare to replace windows across recreate().

Change-Id: Ia144fd6e15340d062d659903548e48121c43f8c4
 2016-05-05 19:52:27 +00:00
Robert Carr
b9d2502eac Merge "Prepare to replace windows across recreate()." into nyc-dev 
am: ea162c3c79

* commit 'ea162c3c7992b01d8d56766a94e56a0cee3fe3b2':
  Prepare to replace windows across recreate().

Change-Id: I3f78aa81d76e0a71f616037c531e7755760b41cf
 2016-05-05 19:47:36 +00:00
TreeHugger Robot
ea162c3c79 Merge "Prepare to replace windows across recreate()." into nyc-dev 2016-05-05 19:38:17 +00:00
Alan Viverette
91aefd574c Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev am: 3a3fb73c75 
am: ff71f781a3

* commit 'ff71f781a369dd1e5231dbbd13981bbb320d49ab':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I9bc9d812b9e08f73d53f8243bf0ae78d7853d72b
 2016-05-05 18:58:59 +00:00
Alan Viverette
ff71f781a3 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 
am: 3a3fb73c75

* commit '3a3fb73c753efb2114693b1943246bc6c47f9470':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I292d86c36049afe621f559d01a12976c9f6068ca
 2016-05-05 18:54:34 +00:00
Alan Viverette
3a3fb73c75 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 2016-05-05 18:37:43 +00:00
Alan Viverette
61c41bf617 Revert "Always assign leftover pixels to last weighted child" 
This reverts commit cc26636f08.

Bug: 27690033
Change-Id: Ib7084dd8961cd486de4e6b13e36da7be887b1835
 2016-05-05 17:54:36 +00:00
Jason Monk
ef8fd63228 Merge "Add action to launch webview implementation settings" into nyc-dev am: c91f5e2971 
am: eb435a3a4c

* commit 'eb435a3a4cd186ada82fae4dcd3083d65ceab603':
  Add action to launch webview implementation settings

Change-Id: I29656ef85a9dda4988ff85e99eda883995538d61
 2016-05-05 17:11:00 +00:00
Jason Monk
eb435a3a4c Merge "Add action to launch webview implementation settings" into nyc-dev 
am: c91f5e2971

* commit 'c91f5e297135f9601c7fa6ebe3f4bdc9ad9af112':
  Add action to launch webview implementation settings

Change-Id: I26fb9e07522ed522ad551e7f39a66b2f9ad93748
 2016-05-05 17:07:12 +00:00
Jason Monk
c91f5e2971 Merge "Add action to launch webview implementation settings" into nyc-dev 2016-05-05 16:56:20 +00:00
Rubin Xu
c926f0eb0f Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am: 1448962a95 
am: b9d94a454d

* commit 'b9d94a454d426e86f7c032f130d089af65120bf4':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I25456d9756eefb619d446f23d48b0919a53c073f
 2016-05-05 13:16:55 +00:00
Rubin Xu
b9d94a454d Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev 
am: 1448962a95

* commit '1448962a95f40db93af02057e0804a375f3d62ca':
  Guard retrievePreRebootSecurityLogs with config flag

Change-Id: I30bfa6eb621ced3a9aab4f10ad8bd89fee6ee675
 2016-05-05 13:12:45 +00:00
Rubin Xu
0fb6b9e18c Guard retrievePreRebootSecurityLogs with config flag 
Bug: 28160645
Change-Id: Ifce884c319019758dfaaa39bc239e9f30962c920
 2016-05-05 12:00:50 +01:00
Alan Viverette
8902b96225 Merge "Always assign leftover pixels to last weighted child" into nyc-dev am: a11c21b412 
am: 9204810e66

* commit '9204810e668d14e3d739726da996a89488e7e6d9':
  Always assign leftover pixels to last weighted child

Change-Id: I5fe075d83f6b299511a92cc5721f0b68614f6e80
 2016-05-05 02:32:29 +00:00
Alan Viverette
1a1301286c Merge "Always assign leftover pixels to last weighted child" into nyc-dev 
am: a11c21b412

* commit 'a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
  Always assign leftover pixels to last weighted child

Change-Id: I80fbcb2d86b718bd02f7e0528bd498b894381502
 2016-05-05 02:30:18 +00:00
Alan Viverette
9204810e66 Merge "Always assign leftover pixels to last weighted child" into nyc-dev 
am: a11c21b412

* commit 'a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
  Always assign leftover pixels to last weighted child

Change-Id: Ibfaa979ba23c204172015fae11a767be8a4852dc
 2016-05-05 02:29:57 +00:00
Alan Viverette
a11c21b412 Merge "Always assign leftover pixels to last weighted child" into nyc-dev 2016-05-05 02:26:45 +00:00
Ruben Brunk
d12543c983 Merge "Update VR API docs." into nyc-dev am: 01d232988a 
am: 2d1a1a4521

* commit '2d1a1a45219d4946527c284eb801a1c9e966966c':
  Update VR API docs.

Change-Id: I6f3c0348d98db2d7c8f6e3d757ac77f02d4e179f
 2016-05-04 23:44:04 +00:00
Ruben Brunk
17f3a40645 Merge "Update VR API docs." into nyc-dev 
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I1b2cc88ca390c90d42cae3736aaf986e6c0e9396
 2016-05-04 23:43:50 +00:00
Ruben Brunk
2d1a1a4521 Merge "Update VR API docs." into nyc-dev 
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I8e9d63e8ff6cab67b6c0def4f09a05fb03a23ecd
 2016-05-04 23:41:38 +00:00
Ruben Brunk
01d232988a Merge "Update VR API docs." into nyc-dev 2016-05-04 23:35:44 +00:00
Chong Zhang
c4c65f211e Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev am: 6afe594461 
am: 242eadabea

* commit '242eadabeabbd4413a0b92e6176d3fa1fbec1389':
  Debug traces to facilitate screen timeout debugging

Change-Id: I905f70f191f02ced4feed2a4e50366cca0240251
 2016-05-04 22:57:56 +00:00
Dianne Hackborn
a14aac9a2d Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev am: 6eb119c7cb 
am: 5081e36897

* commit '5081e368978e00353c5968f0f7656ca28e963b4a':
  Maybe fix issue #28457907: Pebble app crash + reboot

Change-Id: I0db52017c4a351341b0823381e7b85b0c641a16d
 2016-05-04 22:57:53 +00:00
Chong Zhang
242eadabea Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 
am: 6afe594461

* commit '6afe594461930e83cbf5ecf181bf43fcba0060dd':
  Debug traces to facilitate screen timeout debugging

Change-Id: I89dad5e66db460af83deac679f2f81bef34d0e69
 2016-05-04 22:52:55 +00:00
Dianne Hackborn
5081e36897 Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev 
am: 6eb119c7cb

* commit '6eb119c7cb665211d4848c26a3c72d0835e34fed':
  Maybe fix issue #28457907: Pebble app crash + reboot

Change-Id: I9030b23fc42bc9a13a3a7cb0f1b92142bb6ea546
 2016-05-04 22:52:52 +00:00
Chong Zhang
8babbb3d3c Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 
am: 6afe594461

* commit '6afe594461930e83cbf5ecf181bf43fcba0060dd':
  Debug traces to facilitate screen timeout debugging

Change-Id: I6b04707b616a9251b2ebdd3b02cd5e692a479ceb
 2016-05-04 22:52:50 +00:00
Dianne Hackborn
8e3c8c53c8 Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev 
am: 6eb119c7cb

* commit '6eb119c7cb665211d4848c26a3c72d0835e34fed':
  Maybe fix issue #28457907: Pebble app crash + reboot

Change-Id: Ife9159aa9a689f5309e106e07455b19a456cb642
 2016-05-04 22:52:48 +00:00
Chong Zhang
6afe594461 Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 2016-05-04 22:50:11 +00:00
Dianne Hackborn
6eb119c7cb Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev 2016-05-04 22:49:59 +00:00
Chris Craik
115f86846b Merge "Fix View leakage from mPreSortedChildren" into nyc-dev am: 4e34cd0537 
am: 2f66d0a849

* commit '2f66d0a8497d1f1247a7f293b2b681cef1f9057f':
  Fix View leakage from mPreSortedChildren

Change-Id: I317fb1f6d5b0e145601649cd0e43730342a0e80d
 2016-05-04 22:33:13 +00:00
Chris Craik
2f66d0a849 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 
am: 4e34cd0537

* commit '4e34cd05379d1e96a5ca8081b3e3fa3b1a1cc534':
  Fix View leakage from mPreSortedChildren

Change-Id: Idd17fa7d0cb1bfbca1725525d85e4068a234c8b6
 2016-05-04 22:30:30 +00:00
Chris Craik
1318ac2c8a Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 
am: 4e34cd0537

* commit '4e34cd05379d1e96a5ca8081b3e3fa3b1a1cc534':
  Fix View leakage from mPreSortedChildren

Change-Id: I4a2c7016907c22bcb4ae9640aa1feb5a0f812bbb
 2016-05-04 22:30:27 +00:00
TreeHugger Robot
4e34cd0537 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 2016-05-04 22:23:26 +00:00
Chong Zhang
4ffc318012 Debug traces to facilitate screen timeout debugging 
bug: 27522448
Change-Id: I4d51be316e4aedecffb7001126849d7c6136d517
 2016-05-04 15:09:01 -07:00
Chet Haase
c96a245e1a Merge "Force second measure pass when there is a configuration change" into nyc-dev am: c381c4e8e7 
am: 26a4627102

* commit '26a4627102e466e3e7831e84e459d95f0ff7778a':
  Force second measure pass when there is a configuration change

Change-Id: Icbc841e1641bbe2fabac589a3c60fc3404cda0c2
 2016-05-04 21:55:13 +00:00
Yohei Yukawa
1cdcbcbc8f Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev am: 68c1e1935d 
am: 8e0e5e8a88

* commit '8e0e5e8a8884d6536a3ee7511411e7d78d8ed265':
  Fix a behavior change in "Show software keyboard".

Change-Id: I86f131edcaa8ec069848830641a546b80e755f65
 2016-05-04 21:55:10 +00:00
Chet Haase
512c406be9 Merge "Force second measure pass when there is a configuration change" into nyc-dev 
am: c381c4e8e7

* commit 'c381c4e8e7b7dfc2aed0a662bf56e3d6e512df5d':
  Force second measure pass when there is a configuration change

Change-Id: I2586fe3605461b2e6e4d9678afd6436078dab21c
 2016-05-04 21:51:38 +00:00
Chet Haase
26a4627102 Merge "Force second measure pass when there is a configuration change" into nyc-dev 
am: c381c4e8e7

* commit 'c381c4e8e7b7dfc2aed0a662bf56e3d6e512df5d':
  Force second measure pass when there is a configuration change

Change-Id: I34afe7f97bc141bc4981643f61518d4bcbf29ba7
 2016-05-04 21:51:33 +00:00
Chet Haase
c381c4e8e7 Merge "Force second measure pass when there is a configuration change" into nyc-dev 2016-05-04 21:49:11 +00:00
Yohei Yukawa
3af9c01322 Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev 
am: 68c1e1935d

* commit '68c1e1935d5c3de080513a31b305eef722ee380c':
  Fix a behavior change in "Show software keyboard".

Change-Id: I9b2f1e2ac8c595c3b19daab8b4ccb763ab700203
 2016-05-04 21:42:45 +00:00
Yohei Yukawa
8e0e5e8a88 Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev 
am: 68c1e1935d

* commit '68c1e1935d5c3de080513a31b305eef722ee380c':
  Fix a behavior change in "Show software keyboard".

Change-Id: Ia7069eb539a9b809bc3e14514bee16149c9151c8
 2016-05-04 21:42:43 +00:00
Makoto Onuki
bdfb3aada3 Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev 
am: 5b9d876ef5

* commit '5b9d876ef5bf4613d9ef89148c1ab021c473c02e':
  ShortcutManaegr: bug fixes

Change-Id: I3823ba8a62a853d0ee49ec7626778b8fa09adbab
 2016-05-04 21:42:26 +00:00
Wale Ogunwale
8fa700675d Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev 
am: 75179ada54

* commit '75179ada546393cb8929ca9703d39e1151d95ed9':
  Make sure to pause activity before stopping

Change-Id: I5020b92b2edbe0ff749d019fbeb81abf2ae49fe9
 2016-05-04 21:42:18 +00:00
Robin Lee
d319d26279 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2 
am: 78d0888e8c

* commit '78d0888e8c9358681a6f564b30b2cc35bbe72a45':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I7ec39775980ec839aa814cf284ea352789aa788f
 2016-05-04 21:41:23 +00:00
Abhijith Shastry
0734be2f3e Merge "Update BlockedNumberContract documentation." into nyc-dev am: 9a2384a7a6 
am: c7e32aba8d

* commit 'c7e32aba8d9c24040da00d6ec1e599a14c4c4f8d':
  Update BlockedNumberContract documentation.

Change-Id: I136799fbedecbea19a005fe4d47b2e41be98cffb
 2016-05-04 21:40:04 +00:00
Renat Aksitov
09f9bc73f4 Merge "Voice Messaging Intent API." into nyc-dev am: d516e30b91 
am: 032c1a9299

* commit '032c1a92994e251336114c6b600040bf86991772':
  Voice Messaging Intent API.

Change-Id: Iad7c03099fae00d3c1c2bea0f8100608af33851d
 2016-05-04 21:39:47 +00:00
Yohei Yukawa
68c1e1935d Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev 2016-05-04 21:39:15 +00:00
Vladislav Kaznacheev
040646bb08 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev am: 221c6e6db7 
am: 423c902258

* commit '423c9022582b2ae9397a4fb52b0293b313c785cf':
  Fix ClipData JavaDoc and behavior that contradicts JavaDoc

Change-Id: Ib6c6dc2770ff6332fbcb6285e871db971e54b066
 2016-05-04 21:38:17 +00:00
Makoto Onuki
5b9d876ef5 Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev 2016-05-04 21:28:17 +00:00
Alan Viverette
cc26636f08 Always assign leftover pixels to last weighted child 
Bug: 27690033
Change-Id: Ibee51d49d3f7aa923750ce330df2e1aa2156f2bd
 2016-05-04 16:59:38 -04:00