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

306930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
47c4c94100 Merge "Work on separating out the status bar management" 2017-02-09 02:48:36 +00:00
TreeHugger Robot
5ad568f32c Merge "Add command line options for some new intent flags." 2017-02-09 02:35:19 +00:00
TreeHugger Robot
dcd208d167 Merge "Fixing issue with play/pause buttons being inverted." 2017-02-09 02:17:17 +00:00
Jason Monk
aa573e9e86 Work on separating out the status bar management 
Lots of stuff:
 - Make StatusBarIconController be a permanent dependency
 - Break out dark stuff into DarkIconDispatcher
 - Create StatusBarFragment
   - This bit is a bit ugly for now, but will be better later
 - Other stuff probably

Test: runtest systemui
Change-Id: I4973bc9f944e66af92731bf1edd2b39657f1782f
 2017-02-08 19:51:41 -05:00
Dianne Hackborn
797772b162 Add command line options for some new intent flags. 
Forgot to add these when the flags were added.

Test: manual
Change-Id: If71ea756ca85946155d7a6848454f61d137138c0
 2017-02-08 16:33:43 -08:00
TreeHugger Robot
5a0d21156d Merge "Check for null inputs in the ctor." 2017-02-09 00:25:28 +00:00
Dianne Hackborn
0e09fddcd0 Merge "Add new VoiceInteractionSession.setUiEnabled method" 2017-02-09 00:11:01 +00:00
Greg Plesur
2d2d671229 Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83 am: ddec36e31a" into nyc-mr2-dev-plus-aosp 
am: c296020f55

Change-Id: I98f4fac8b063ebec21271e5b46ff3027305c1165
 2017-02-09 00:03:12 +00:00
Greg Plesur
edfc9370d9 Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83 am: ddec36e31a 
am: 50447143c2

Change-Id: Iadf6f2217415d0498254eb4d1669c5f93ac8a9d0
 2017-02-09 00:03:03 +00:00
Greg Plesur
f1929eee62 Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83 am: 58fce5386b" into nyc-mr2-dev-plus-aosp 
am: 735e8230ad

Change-Id: I96ba158ea11611e5d4d82d4ad36af0676b64592a
 2017-02-09 00:01:44 +00:00
Greg Plesur
bfce5bcfc8 Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83 am: 58fce5386b 
am: 5d9343b60a

Change-Id: I2d163d2a3eb1edfd0329992ae5c98c9b11cd9ad5
 2017-02-09 00:01:39 +00:00
Greg Plesur
30110eaeec Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() am: c7b18342ea am: 66af3515de 
am: 7658c60e91

Change-Id: Ic433afeb6b791173c90546da98ce7bdddfdd5629
 2017-02-09 00:00:08 +00:00
Greg Plesur
c928e9fa53 Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() am: c7b18342ea am: b6323817db 
am: f206de957a

Change-Id: Ic1f2bd765ecc3eb7239923147a93fc4afa6eb70c
 2017-02-08 23:56:33 +00:00
Android Build Merger (Role)
c296020f55 Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83 am: ddec36e31a" into nyc-mr2-dev-plus-aosp 2017-02-08 23:54:12 +00:00
Greg Plesur
50447143c2 Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83 
am: ddec36e31a

Change-Id: Id36db178cad26adba0a43370af2f4f6cdd1a0443
 2017-02-08 23:53:29 +00:00
Android Build Merger (Role)
735e8230ad Merge "Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83 am: 58fce5386b" into nyc-mr2-dev-plus-aosp 2017-02-08 23:53:19 +00:00
Greg Plesur
7658c60e91 Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() am: c7b18342ea 
am: 66af3515de

Change-Id: I6e97c2c08b8773c9b0f3a472c8f679cc23e8e365
 2017-02-08 23:52:35 +00:00
Greg Plesur
5d9343b60a Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev am: 8a2ea2cf83 
am: 58fce5386b

Change-Id: I784fc51c541da12056f7c47810d3b222f40dea04
 2017-02-08 23:52:32 +00:00
Greg Plesur
f206de957a Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() am: c7b18342ea 
am: b6323817db

Change-Id: I5f3b6935af32ba94fef35d8db573d75925eee434
 2017-02-08 23:49:32 +00:00
Andrew Sapperstein
7a56366349 Merge "Add additional logging for temperature readings." into nyc-mr2-dev am: 759e1c5219 
am: 241ee625bf  -s ours

Change-Id: I3030b8c618d2a213f14bd3b79951f52c9a7c1f20
 2017-02-08 23:47:50 +00:00
Andrew Sapperstein
2e258d65cc Add additional logging for temperature readings. am: 4cfe56709b 
am: 0d86733ab7  -s ours

Change-Id: I10aef54ae8edc77a3c9258b135225e609dc7db18
 2017-02-08 23:46:33 +00:00
Greg Plesur
58fce5386b Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev 
am: 8a2ea2cf83

Change-Id: Ie25c9bfa82ccffc58b68c13b515d7f556d955289
 2017-02-08 23:44:34 +00:00
Greg Plesur
b6323817db Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() 
am: c7b18342ea

Change-Id: I1969d32950057ecacc03e8c5d00ad185fb627044
 2017-02-08 23:44:27 +00:00
Greg Plesur
ddec36e31a Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev 
am: 8a2ea2cf83

Change-Id: I9c2c3d822023277aada4685a11f4b272585550ea
 2017-02-08 23:44:17 +00:00
Greg Plesur
66af3515de Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() 
am: c7b18342ea

Change-Id: I692fee4165de9a274d8eb8f0deaf49762974bb22
 2017-02-08 23:44:13 +00:00
Andrew Sapperstein
241ee625bf Merge "Add additional logging for temperature readings." into nyc-mr2-dev 
am: 759e1c5219

Change-Id: Id598870f05298933d4ef053e0ea3b37113e01f65
 2017-02-08 23:37:26 +00:00
Andrew Sapperstein
0d86733ab7 Add additional logging for temperature readings. 
am: 4cfe56709b

Change-Id: I57547d77357deaa663c482937f26890930dc8845
 2017-02-08 23:37:19 +00:00
TreeHugger Robot
8a2ea2cf83 Merge "Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()" into cw-f-dev 2017-02-08 23:36:09 +00:00
TreeHugger Robot
759e1c5219 Merge "Add additional logging for temperature readings." into nyc-mr2-dev 2017-02-08 23:31:15 +00:00
Jeremy Joslin
e925aeacab Check for null inputs in the ctor. 
Test: gts-tradefed run gts -m GtsGmscoreHostTestCases -t com.google.android.gts.wifi.WifiHostTest
Bug: 35152108
Change-Id: I321b52b0feb62aced20bca7f47e962f5c7d78343
 2017-02-08 14:50:34 -08:00
TreeHugger Robot
4a7b9f2b90 Merge "Fix a crash when opening app data usage for work profile" 2017-02-08 22:33:47 +00:00
Jean-Michel Trivi
fd4e9e0f8d Merge "AudioService: mute media/game players during phone calls" 2017-02-08 22:28:45 +00:00
Evan Rosky
f10db8e444 Merge "Separate cluster-focus and default-focus." 2017-02-08 22:27:53 +00:00
Tyler Gunn
c1c1c23b17 Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 am: e55b11573e am: 998655f80e 
am: 58d8c5eb07  -s ours

Change-Id: Ic1f76d23f1d0c28c74cbea392a3998181d9d6da7
 2017-02-08 22:10:20 +00:00
Tyler Gunn
58d8c5eb07 Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 am: e55b11573e 
am: 998655f80e

Change-Id: I01c5d8c15ce9377f126fc7268bd1a8ecee602dc8
 2017-02-08 22:05:45 +00:00
Daniel Sandler
fa234b2f47 Merge changes from topic 'battery3' 
* changes:
  Fix regression in battery size.
  Clean up BatteryMeterDrawable internal api.
 2017-02-08 22:03:14 +00:00
Tyler Gunn
998655f80e Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 
am: e55b11573e

Change-Id: Iffef42c4050bbda451e9cd99cb90589060b105bd
 2017-02-08 22:01:07 +00:00
Dianne Hackborn
59da805846 Add new VoiceInteractionSession.setUiEnabled method 
This allows the session to turn off all of its UI.  Use it
in onCreate() to prevent the session from ever creating any
of its UI.  Switched the window creation and initialization to
happen lazily to support this.

Test: New test added to android.assist.cts.LifecycleTest
Bug: 30999386

Change-Id: I8eacb3697c8ac9908c50b9577abea2d20597b016
 2017-02-08 14:00:31 -08:00
Tyler Gunn
e55b11573e Merge "Change prototype for "setCamera" in IMS VideoProvider." 
am: c164b159f8

Change-Id: I3abbb1de951f65c226a6849f34946880e9f650ff
 2017-02-08 21:56:39 +00:00
TreeHugger Robot
a327386e90 Merge "Fix typo in ScoredNetwork javadoc." 2017-02-08 21:56:18 +00:00
Treehugger Robot
c164b159f8 Merge "Change prototype for "setCamera" in IMS VideoProvider." 2017-02-08 21:46:44 +00:00
Greg Plesur
c7b18342ea Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked() 
BUG: 34824902
Change-Id: I49d4d7043829862e1abacb3f400a6690f454d6c0
 2017-02-08 16:32:51 -05:00
TreeHugger Robot
dc8912b2bd Merge "Delay changing state of added fragments until all executed." 2017-02-08 21:32:44 +00:00
TreeHugger Robot
5d6791a0a7 Merge "Retrieving groups shouldn't have side effects" 2017-02-08 21:32:16 +00:00
Mathias Agopian
988f58728c Merge "moved GraphicEnv from libgui to libui" 2017-02-08 21:27:21 +00:00
TreeHugger Robot
359136303d Merge "Fix NPE when session is finished before service replies." 2017-02-08 21:17:17 +00:00
Roshan Pius
d4194a50a8 Merge changes If970d851,I5bd11574 am: 3c054697fc am: 65eef762a9 am: 6dd6ba628b 
am: b9f9e64619

Change-Id: I7f140b1b3ca363e0a53ffc08b2c6ad9020ecdf45
 2017-02-08 21:15:28 +00:00
Roshan Pius
38a997c06f WifiManager: API upates for O am: fb441f5009 am: aabb1c7ecf am: 02bf13a6c9 
am: ec38eb6988

Change-Id: I1cb223bff8dd29e11316bf69c7f200caac2a125b
 2017-02-08 21:14:19 +00:00
Roshan Pius
507250e5a3 WifiConfiguration: Remove priority field am: 45491113ed am: 51641c20b2 am: 707ced526f 
am: 6a4322b6d6

Change-Id: Iae46e33f4d04f8bff3da569670fe2474d22cd80e
 2017-02-08 21:13:12 +00:00
Roshan Pius
b9f9e64619 Merge changes If970d851,I5bd11574 am: 3c054697fc am: 65eef762a9 
am: 6dd6ba628b

Change-Id: I2e150126a816314c057e31ec5902088814890421
 2017-02-08 21:08:41 +00:00