drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
322,728 Commits 1 Branch 0 Tags
Commit Graph

322728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Kline
7f75a7fc6d Merge "Fix broken DUN evaluation logic" am: b0daeeb879 am: dd76dd1eea am: 5d1bcf5bca 
am: 260fa1dd9e

Change-Id: I293b4cd57dcd1968c2b38f4e92e24cc0d2e135a9
 2017-05-16 08:25:47 +00:00
Erik Kline
260fa1dd9e Merge "Fix broken DUN evaluation logic" am: b0daeeb879 am: dd76dd1eea 
am: 5d1bcf5bca

Change-Id: Ib9a469b16a598c47b615a15fc7cce420bfe4b8b7
 2017-05-16 08:19:22 +00:00
Erik Kline
5d1bcf5bca Merge "Fix broken DUN evaluation logic" am: b0daeeb879 
am: dd76dd1eea

Change-Id: I7e194d1c17df7770706e3c80e587ce296f1e40f8
 2017-05-16 08:13:14 +00:00
Erik Kline
dd76dd1eea Merge "Fix broken DUN evaluation logic" 
am: b0daeeb879

Change-Id: Iae7450ef21485c5a13f45fab570bf658b2da8f28
 2017-05-16 08:06:42 +00:00
Treehugger Robot
b0daeeb879 Merge "Fix broken DUN evaluation logic" 2017-05-16 07:58:02 +00:00
Sungsoo
b64a28ea80 Merge "MediaBrowser: Allow to connect while disconnecting" into oc-dev am: 69c81d8cef 
am: 15cbcc866b

Change-Id: I3b75ab0c160f63d4a77d36bcd27b03c4014fbd90
 2017-05-16 06:46:12 +00:00
Sungsoo
15cbcc866b Merge "MediaBrowser: Allow to connect while disconnecting" into oc-dev 
am: 69c81d8cef

Change-Id: I807ee9c4357876d691d3791815f14265984cea6b
 2017-05-16 06:37:19 +00:00
TreeHugger Robot
69c81d8cef Merge "MediaBrowser: Allow to connect while disconnecting" into oc-dev 2017-05-16 06:28:09 +00:00
Erik Kline
54f2f3704e Fix broken DUN evaluation logic 
Test: as follows
    - built
    - booted
    - flashed
    - runtest frameworks-net passes
Bug: 32163131
Bug: 38152109
Bug: 38186915
Change-Id: Id4803504e825290d62c0b51a2b9bd664dcef30b1
 2017-05-16 15:14:45 +09:00
Ian Pedowitz
52e33eed24 Merge "Revert "Revert "O is API 26""" into oc-dev am: 655ab3f59b 
am: b6290ff39e

Change-Id: If4c21c8d37d753b00e4478c21bf5e6dbe9f39288
 2017-05-16 05:04:15 +00:00
Ian Pedowitz
3435681fbc Merge "Revert "Revert "Resource ID fixup.""" into oc-dev am: a11196074b 
am: 9ebb128c40

Change-Id: I909d950367570f907b87adf1740c3d6c1f6ed94a
 2017-05-16 05:01:08 +00:00
Ian Pedowitz
b6290ff39e Merge "Revert "Revert "O is API 26""" into oc-dev 
am: 655ab3f59b

Change-Id: I28655c728468f2348b2ba83b77f2aae3d7b22c06
 2017-05-16 04:02:51 +00:00
Ian Pedowitz
9ebb128c40 Merge "Revert "Revert "Resource ID fixup.""" into oc-dev 
am: a11196074b

Change-Id: I1ea7b4a17bf7ba6de43db52e996aff4c56dc3bf0
 2017-05-16 04:00:05 +00:00
Ian Pedowitz
655ab3f59b Merge "Revert "Revert "O is API 26""" into oc-dev 2017-05-16 03:33:05 +00:00
Ian Pedowitz
a11196074b Merge "Revert "Revert "Resource ID fixup.""" into oc-dev 2017-05-16 03:32:33 +00:00
Kirill Grouchnikov
4aa3baadbe Merge "Revert "Tweak test app makefile with extra resources"" into oc-dev am: 7e08c7ec17 
am: 82f46bcd19

Change-Id: I66374bb95ec434acfd02ee1163300e3965776a4c
 2017-05-16 02:06:27 +00:00
Kirill Grouchnikov
82f46bcd19 Merge "Revert "Tweak test app makefile with extra resources"" into oc-dev 
am: 7e08c7ec17

Change-Id: I542f50f407964b30b0016400bb88348671a5c550
 2017-05-16 01:52:49 +00:00
Aurimas Liutikas
4adf179816 Merge "Update TimePicker mode switch icon." into oc-dev am: 1812e446e1 
am: 3ff9b30724

Change-Id: Idb7d538321c349d3d7b237df72d25e1d3fd9ff7a
 2017-05-16 01:49:46 +00:00
Kirill Grouchnikov
7e08c7ec17 Merge "Revert "Tweak test app makefile with extra resources"" into oc-dev 2017-05-16 01:43:33 +00:00
Svet Ganov
647dc84560 Merge "Support recursive static shared lib dependency" into oc-dev am: e04765998e 
am: 8adfc2cac7

Change-Id: Ib07a986a02372d40ce93b9beb8e1ac74f0d3561b
 2017-05-16 01:38:57 +00:00
Kirill Grouchnikov
8a06040d80 Revert "Tweak test app makefile with extra resources" 
This reverts commit f0435e183906dc39432fb4c937854d3737de3adc.

Bug: 30240339
Change-Id: I6cc03188d5666eded5869c583db76e02b6f90794
 2017-05-16 01:34:15 +00:00
Rob Carr
93d5c06222 Merge "Preserve non-floating state when entering pinned stack." into oc-dev am: f5b6818009 
am: dff4323f01

Change-Id: Ie007a26d4d0264f5a0609cbc0996a5a509734382
 2017-05-16 01:28:14 +00:00
Kirill Grouchnikov
c8ac81e071 Merge "Tweak test app makefile with extra resources" into oc-dev am: 2b1df4ec14 
am: 0eeaa4643c

Change-Id: Ib1ef7ab4481cf24a5f9a4eb8c03963355d28de5b
 2017-05-16 01:21:00 +00:00
Aurimas Liutikas
3ff9b30724 Merge "Update TimePicker mode switch icon." into oc-dev 
am: 1812e446e1

Change-Id: I8289ec34bef3f03a0fac671208e7257b547e49e1
 2017-05-16 01:19:47 +00:00
TreeHugger Robot
1812e446e1 Merge "Update TimePicker mode switch icon." into oc-dev 2017-05-16 01:14:01 +00:00
Svet Ganov
8adfc2cac7 Merge "Support recursive static shared lib dependency" into oc-dev 
am: e04765998e

Change-Id: I674191296c7d0a409e19614b2f18a4b86bf03ab8
 2017-05-16 00:03:00 +00:00
TreeHugger Robot
e04765998e Merge "Support recursive static shared lib dependency" into oc-dev 2017-05-15 23:49:07 +00:00
TreeHugger Robot
c0c9bd075a Merge "AOD: Fix time tick alarm registration" 2017-05-15 23:40:08 +00:00
Rob Carr
dff4323f01 Merge "Preserve non-floating state when entering pinned stack." into oc-dev 
am: f5b6818009

Change-Id: I22f408fef8007cb5c1266a7115da01c07b4f0eb4
 2017-05-15 23:38:21 +00:00
Kirill Grouchnikov
0eeaa4643c Merge "Tweak test app makefile with extra resources" into oc-dev 
am: 2b1df4ec14

Change-Id: I861ebd781bec4c41582c9a11f9cb79fb8982be18
 2017-05-15 23:26:16 +00:00
Jesse Hall
32d3babb24 Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev am: 40b274915e 
am: 4e99819ba6

Change-Id: I721dd6b03d7f5938de7e81b8fb25feb04babaa6a
 2017-05-15 23:23:35 +00:00
Rob Carr
f5b6818009 Merge "Preserve non-floating state when entering pinned stack." into oc-dev 2017-05-15 23:17:33 +00:00
TreeHugger Robot
269eab538e Merge "Update the mTotalDuration for each animation in an AnimatorSet." 2017-05-15 23:16:43 +00:00
Jesse Hall
4e99819ba6 Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev 
am: 40b274915e

Change-Id: I849c6a942448536b67d79f0687f07ed36567fa1b
 2017-05-15 23:15:04 +00:00
Kirill Grouchnikov
2b1df4ec14 Merge "Tweak test app makefile with extra resources" into oc-dev 2017-05-15 23:11:09 +00:00
TreeHugger Robot
40b274915e Merge "Require targetSdkVersion>=O for updated graphics driver packages" into oc-dev 2017-05-15 23:02:05 +00:00
Hall Liu
2aedabda2d Merge "Merge "Change signalStrength to int." am: 73818566d6 am: 762e0c1162 am: 7e80c3f00b" into oc-dev-plus-aosp 
am: 74714d0323

Change-Id: Ibe71de241facf5af39423da96801b275712744ce
 2017-05-15 22:46:44 +00:00
Wale Ogunwale
0f8ce259fb Merge "Changed alert window notifications to use single channel" into oc-dev am: 648e127fcb 
am: 33c831a15c

Change-Id: Ib94d4d4e12cf6cfb7fc9e6c2a63b4d47b40223ca
 2017-05-15 22:43:42 +00:00
Aurimas Liutikas
c0aa90d9ee Update TimePicker mode switch icon. 
Previously the icon was an event icon, but a clock icon is
more appropriate so we are switching to that instead.

Bug: 37351390
Test: Open time picker
Change-Id: I47e6caf3c341c10264168004628288fd00e4601a
 2017-05-15 15:39:28 -07:00
Android Build Merger (Role)
74714d0323 Merge "Merge "Change signalStrength to int." am: 73818566d6 am: 762e0c1162 am: 7e80c3f00b" into oc-dev-plus-aosp 2017-05-15 22:38:33 +00:00
Hall Liu
deeda1e353 Merge "Change signalStrength to int." am: 73818566d6 am: 762e0c1162 
am: 7e80c3f00b

Change-Id: Id3359056c247288825ec672963b538cfaa121937
 2017-05-15 22:35:04 +00:00
Wale Ogunwale
33c831a15c Merge "Changed alert window notifications to use single channel" into oc-dev 
am: 648e127fcb

Change-Id: I0afd77da2da1c7e14cec98be39bcd595ec69267e
 2017-05-15 22:34:59 +00:00
TreeHugger Robot
648e127fcb Merge "Changed alert window notifications to use single channel" into oc-dev 2017-05-15 22:25:43 +00:00
Hall Liu
7e80c3f00b Merge "Change signalStrength to int." am: 73818566d6 
am: 762e0c1162

Change-Id: I5cf3c07071c57c362847133c8858227d58662ce8
 2017-05-15 22:25:34 +00:00
Hall Liu
762e0c1162 Merge "Change signalStrength to int." 
am: 73818566d6

Change-Id: I8a9afddc749afc216dc1dc16f0465df1d0dab24f
 2017-05-15 22:14:59 +00:00
Hall Liu
73818566d6 Merge "Change signalStrength to int." 2017-05-15 22:01:21 +00:00
Svet Ganov
58c99f0207 Support recursive static shared lib dependency 
Test: Updated the static shared lib CTS tests to verify that
      All static shared lib CTS tests pass

bug:35359862

Change-Id: Id4a0dabbc9d8e98962e92b6f537f6ffffa63b585
 2017-05-15 14:43:17 -07:00
Yuchen He
44a2b5723c Merge "Fix AeModeAndLock test cases. Bug: 36103813" 2017-05-15 21:41:30 +00:00
Philip Quinn
7fb80f7d27 Update the mTotalDuration for each animation in an AnimatorSet. 
A cache was introduced in I677bc289f2ba430466f2d90ebc14368cb7b75118 to
optimise calls to createDependencyGraph(), but the update was removed in
If1dc6e8dbc93a4bf5ade8c5b0dcf43d3ee6ba7b5. This patch reintroduces the
update when calculating child animation start/end times to re-enable the
optimisation.

Test: cts-tradefed run cts-dev --module CtsAnimationTestCases
Change-Id: Ie9dad4049c07a151889b57809bf844ab854ff482
 2017-05-15 21:36:30 +00:00
Dmitry Dementyev
de56e8e632 Merge "Don't request account access for apps if it is explictly made not visible to them." into oc-dev am: 1827f12b50 
am: 41b5c9441d

Change-Id: Ic33c4b57cb02226215664a781821e97a7fbf619e
 2017-05-15 21:32:20 +00:00