Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,780 Commits 3 Branches 0 Tags
12a44ca6f4e86cbf5d281eeb063df16ecc6abc27
Commit Graph

9098 Commits

Author SHA1 Message Date
Jorim Jaggi
274b9c97ea am bcce1830: am c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev automerge: 57b440e 
* commit 'bcce1830206b44efaaaa349a7f62637a5da3b290':
  Fix SysUI when an app started from the affordances crashes
 2014-12-10 21:59:18 +00:00
Dan Sandler
8be6baeee3 am 9b0f0d11: am 35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev automerge: b394253 
* commit '9b0f0d1142c96d3c3caf2be41a9836f18c6fd0e1':
  BluetoothControllerImpl: track bluetooth better
 2014-12-10 21:59:13 +00:00
Jorim Jaggi
bcce183020 am c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev 
automerge: 57b440e

* commit '57b440e206f142368bcf42885d3f3763554173e8':
  Fix SysUI when an app started from the affordances crashes
 2014-12-10 19:16:38 +00:00
Dan Sandler
9b0f0d1142 am 35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev 
automerge: b394253

* commit 'b394253a3f86df065783d5c07250c155428702e5':
  BluetoothControllerImpl: track bluetooth better
 2014-12-10 19:15:11 +00:00
Jorim Jaggi
c79343ce65 Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev 2014-12-10 16:32:20 +00:00
Jorim Jaggi
826730aeb9 Fix SysUI when an app started from the affordances crashes 
- Fix infinite recursion in this case.
- If the app crashes, we are waiting for either setOccluded or
  hideKeyguard to be called. However, neither of these gets called
  in this case, so we recover from it by adding a timeout of 5
  seconds.

Bug: 18652789
Change-Id: Ib9a043f5692a8578703df1db08e1a6b9dcfbc742
 2014-12-10 17:22:58 +01:00
Dan Sandler
3585062760 Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev 2014-12-10 15:43:43 +00:00
Jason Monk
4630c89a76 BluetoothControllerImpl: track bluetooth better 
Match settings behavior better:
 - Get connection info from profiles so it is for all devices
   (CONNECTION_STATE_CHANGED only updates one)
 - Disconnect from all known connections so that 'x' does something
 - When device is disconnected without CONNECTION_STATE_CHANGED
   then find a new 'last' device that is connected
 - Listen to a bunch more broadcasts to make sure info is always
   up to date.

Bug: 18210666
Bug: 18638010
Change-Id: Ie003b67bbdd0d452b7472c644d90bca929e5cd29
 2014-12-10 10:32:43 -05:00
Geoff Mendal
981a7e5a94 Import translations. DO NOT MERGE 
Change-Id: Ief67a9aee9b6caa15b87ae475088b69d19deddaf
Auto-generated-cl: translation import
 2014-12-10 07:05:35 -08:00
Geoff Mendal
a65ea3dfdc Import translations. DO NOT MERGE 
Change-Id: Icfd467c7b204b82119ee78b0bfa34d385786d251
Auto-generated-cl: translation import
 2014-12-10 06:52:52 -08:00
Jason Monk
dc6b35f54e am 3c8e51ab: am 7940f55c: am 6f6bc554: Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev 
* commit '3c8e51ab8dd0b9fb58c3c64768576841dbce4c3e':
  Push inet condition to new MobileSignalControllers
 2014-12-09 23:49:09 +00:00
Wink Saville
189c180857 am 7a4df2b7: am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 
* commit '7a4df2b7d8fc162881dd482fb13fe85c780d0351':
  Add subId as parameter for get/setDataEnabled.
 2014-12-09 23:47:19 +00:00
Jorim Jaggi
4b89a3245d am 6c0c349f: am bd6aff3b: am 9ba89ad8: Merge "Make hint text centerred if multiline" into lmp-mr1-dev 
* commit '6c0c349f82d0d94eda4b2a6d3b97ec6c24abdccd':
  Make hint text centerred if multiline
 2014-12-09 23:46:38 +00:00
Jorim Jaggi
d711cbc0e7 am 029c90fd: am d1aa0273: am 99117c9b: Merge "Reinspect notification for dark mode when updated" into lmp-mr1-dev 
* commit '029c90fdb181e13737b42ae54f099514f1c55b10':
  Reinspect notification for dark mode when updated
 2014-12-09 23:46:34 +00:00
Jorim Jaggi
2f55ea68fa am ef9db949: am fa9f1c5d: am 0d0bd44d: Merge "Update dark mode when notification is updated" into lmp-mr1-dev 
* commit 'ef9db94914cc2614ec6828719f2bf7a5d4a57f51':
  Update dark mode when notification is updated
 2014-12-09 23:46:29 +00:00
Dan Sandler
5e3c3e77eb am 4ced1d95: am 7971db8c: am c8466327: Squelch chatty log messages. 
* commit '4ced1d959024e2d74f92d9fbdd21b787fd1ba53c':
  Squelch chatty log messages.
 2014-12-09 23:46:24 +00:00
Dan Sandler
030619b96a am c0f60f5e: am 139619b7: am e912c9cc: Repair wifi/cellular kerning. 
* commit 'c0f60f5e55d9d3f3c11c850b7c804f786fa8ae29':
  Repair wifi/cellular kerning.
 2014-12-09 23:46:19 +00:00
Winson Chung
2cc3d67f94 am b8c4a0f9: am 87024f73: am 16158852: Merge "Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)" into lmp-mr1-dev 
* commit 'b8c4a0f99864378dc256c66db22970a53a82fc4c':
  Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)
 2014-12-09 22:23:33 +00:00
John Spurlock
089c6d79e3 am ef10307e: am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 
* commit 'ef10307e4a4942c5867ba696e12e13556ac7a716':
  Zen: New behavior for built-in downtime + nextalarm conditions.
 2014-12-09 22:23:04 +00:00
Jason Monk
85a233f508 am d3eee336: am 15a8a153: am 32eb928c: Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev 
* commit 'd3eee336d68bf44aba42a834bdf76a8fa1c8f5e8':
  QS Wifi panel show icon on secure networks
 2014-12-09 22:22:31 +00:00
Jason Monk
3c8e51ab8d am 7940f55c: am 6f6bc554: Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev 
* commit '7940f55c3a1e4038cb01e9909717edbf34d83391':
  Push inet condition to new MobileSignalControllers
 2014-12-09 22:09:56 +00:00
Jason Monk
6f6bc554fa Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev 2014-12-09 20:13:39 +00:00
Wink Saville
7a4df2b7d8 am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 
* commit '2f5cb843553a596d314596c2bb776541db864d63':
  Add subId as parameter for get/setDataEnabled.
 2014-12-09 18:06:03 +00:00
Wink Saville
15b29ac7fa Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 2014-12-09 17:52:27 +00:00
Jason Monk
25d8a48e73 Push inet condition to new MobileSignalControllers 
When new MobileSignalControllers were created after we already
received the inet condition broadcast, they would never receive
the current state of inet condition.  This pushes it to all
controllers whenever they are created.

Bug: 18666876
Change-Id: Ie9997f94f3fbe206ed222a62e2a902fd43f4d67c
 2014-12-09 12:51:35 -05:00
Jorim Jaggi
6c0c349f82 am bd6aff3b: am 9ba89ad8: Merge "Make hint text centerred if multiline" into lmp-mr1-dev 
* commit 'bd6aff3b58ee3ee6be0cd657d8b227483d37d96f':
  Make hint text centerred if multiline
 2014-12-09 15:40:54 +00:00
Jorim Jaggi
029c90fdb1 am d1aa0273: am 99117c9b: Merge "Reinspect notification for dark mode when updated" into lmp-mr1-dev 
* commit 'd1aa0273dda18216cbe0d5161e644eb1680875fc':
  Reinspect notification for dark mode when updated
 2014-12-09 15:40:48 +00:00
Jorim Jaggi
ef9db94914 am fa9f1c5d: am 0d0bd44d: Merge "Update dark mode when notification is updated" into lmp-mr1-dev 
* commit 'fa9f1c5d42c3716062323c34ca502d17e284d536':
  Update dark mode when notification is updated
 2014-12-09 15:40:42 +00:00
Dan Sandler
4ced1d9590 am 7971db8c: am c8466327: Squelch chatty log messages. 
* commit '7971db8cfca67b8d7d37e339cb1b021a1da6ee06':
  Squelch chatty log messages.
 2014-12-09 15:40:34 +00:00
Dan Sandler
c0f60f5e55 am 139619b7: am e912c9cc: Repair wifi/cellular kerning. 
* commit '139619b753e906c33ece2f1fc040ddd118980d8c':
  Repair wifi/cellular kerning.
 2014-12-09 15:40:28 +00:00
Jorim Jaggi
9ba89ad8eb Merge "Make hint text centerred if multiline" into lmp-mr1-dev 2014-12-09 15:11:48 +00:00
Jorim Jaggi
99117c9b11 Merge "Reinspect notification for dark mode when updated" into lmp-mr1-dev 2014-12-09 15:11:23 +00:00
Jorim Jaggi
0d0bd44d64 Merge "Update dark mode when notification is updated" into lmp-mr1-dev 2014-12-09 15:10:52 +00:00
Dan Sandler
c846632762 Squelch chatty log messages. 
Bug: 18666850
Change-Id: I0f9fe4fd0143b5668f66bd0a9c407a5018876b44
 2014-12-09 14:37:29 +00:00
Dan Sandler
e912c9cc39 Repair wifi/cellular kerning. 
The wifi spacer should only be shown if the first mobile
network has a data type indicator.

Bug: 18665813
Change-Id: Ifcd3a61ebc8cdb76d134baa23b22f1291edadd28
 2014-12-09 14:36:46 +00:00
Jeff Davidson
01b43ded9b am 5550a408: am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev 
* commit '5550a408c4b9a530674a1766875f272e46a1e1fb':
  Show "Connected via Wi-Fi assistant" for ephemeral networks.
 2014-12-09 01:00:40 +00:00
Sanket Padawe
13ead56beb am 17c2719d: am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev 
* commit '17c2719d037bee0823dd90c363cee4716ed43d5b':
  Doing provisioning check for wifi tethering from SystemUI
 2014-12-09 00:19:38 +00:00
Chris Wren
0d6aacb802 am d4ba216a: am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev 
* commit 'd4ba216a0f0e7b175fa1aa6a054c6f257cb88c17':
  Avoid race condition in heads up snooze code path.
 2014-12-09 00:18:57 +00:00
Dan Sandler
864fda2cc7 am b3014b0f: am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev 
* commit 'b3014b0f3ae26c5b8e42bee79600a293787866da':
  RTL support for Lollipop Land.
 2014-12-09 00:18:26 +00:00
Dan Sandler
36d2b5fdf4 am c92c94a5: am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 
* commit 'c92c94a5b645805372cf1c9d11d9d19dcd71ad91':
  Don't forget to listen for USER_ALL broadcasts.
 2014-12-09 00:17:48 +00:00
Justin Harrison
18b4204ee5 am 79e346fe: am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev 
* commit '79e346fe1bdb4f03e318c9f7ff3b3c7178800413':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
 2014-12-09 00:17:39 +00:00
Winson Chung
b8c4a0f998 am 87024f73: am 16158852: Merge "Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)" into lmp-mr1-dev 
* commit '87024f7335439511aed0da8696811c3c4944b8c2':
  Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)
 2014-12-08 19:45:05 +00:00
John Spurlock
ef10307e4a am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 
* commit '20a46fb14fa961638c0c155ea58e75ba5e33bb4e':
  Zen: New behavior for built-in downtime + nextalarm conditions.
 2014-12-08 19:43:38 +00:00
Jason Monk
d3eee336d6 am 15a8a153: am 32eb928c: Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev 
* commit '15a8a1531eb457a71fe2db6c6d2bde981d5d7944':
  QS Wifi panel show icon on secure networks
 2014-12-08 19:42:56 +00:00
Jeff Davidson
5550a408c4 am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev 
* commit '5b8c5dd41e386e696d7e8705f84982a91d1596ae':
  Show "Connected via Wi-Fi assistant" for ephemeral networks.
 2014-12-08 19:36:46 +00:00
Sanket Padawe
17c2719d03 am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev 
* commit '49aeee2e791ec85a1c2f202d29e7113dc9d9cae0':
  Doing provisioning check for wifi tethering from SystemUI
 2014-12-08 19:17:45 +00:00
Chris Wren
d4ba216a0f am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev 
* commit 'ea9abd14dc4d4028f74b079c0462dec4fa7d6d18':
  Avoid race condition in heads up snooze code path.
 2014-12-08 19:17:09 +00:00
Dan Sandler
b3014b0f3a am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev 
* commit '9e3adb821bef924cac5fb21f1e6c539495f3e831':
  RTL support for Lollipop Land.
 2014-12-08 19:16:26 +00:00
Dan Sandler
c92c94a5b6 am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev 
* commit '2f6d30dfe60826027af9b59d80c536e8f424545d':
  Don't forget to listen for USER_ALL broadcasts.
 2014-12-08 19:15:06 +00:00
Justin Harrison
79e346fe1b am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev 
* commit '66351d623acfe67033c605cce4a5d52faab3fb96':
  Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user.
 2014-12-08 19:14:38 +00:00