Commit Graph

6812 Commits

Author SHA1 Message Date
Jorim Jaggi
61a5abcf96 am d5b3a35c: am 5f3af144: am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev
* commit 'd5b3a35c14130deba54d9e72a10cce16adf7b99b':
  Fix touch-to-wake while dozing
2015-08-13 03:18:25 +00:00
Jorim Jaggi
559b8c5f4e Merge commit '80581f7a' into master
Change-Id: Ifd8f9c7a854901e0a48bc8a611cfb002fa37298c
2015-08-12 20:09:52 -07:00
Jorim Jaggi
d5b3a35c14 am 5f3af144: am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev
* commit '5f3af1449aa9a86768f7768c14eaeba927733c91':
  Fix touch-to-wake while dozing
2015-08-13 01:18:24 +00:00
Jorim Jaggi
80581f7a65 am deb6a3ac: am 73d9e1ce: am 69082a29: Merge "Require strong authentication after a timeout" into mnc-dr-dev
* commit 'deb6a3acbdbf81a995cc3c1eb2475b041564d44d':
  Require strong authentication after a timeout
2015-08-13 01:18:18 +00:00
Jorim Jaggi
aabab27028 Fix touch-to-wake while dozing
Bug: 23113439
Change-Id: I7abcf1b4298fc832ba78df742c691246766993b1
2015-08-12 16:45:34 -07:00
Jorim Jaggi
25b4d4b280 Require strong authentication after a timeout
Bug: 21594472
Change-Id: Iab169d4fa2e4ad134f8c8579654b28e96b5b1385
2015-08-12 16:39:56 -07:00
Jason Monk
88a96f5827 am 9ec018e5: am fc10c986: am 36ea805f: am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev
* commit '9ec018e54b56b6f62d29ab719371469049a5b3a3':
  Fix tuner for secondary users
2015-08-12 18:32:51 +00:00
Jason Monk
9ec018e54b am fc10c986: am 36ea805f: am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev
* commit 'fc10c9863394c67fd419b6f25e2dd8ecef41c4d3':
  Fix tuner for secondary users
2015-08-12 18:27:44 +00:00
Jason Monk
670b8b5971 am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev
* commit '0c7629579184f85d36a4854e7c6f5b81f5b7299e':
  Fix tuner for secondary users
2015-08-12 18:06:18 +00:00
Jason Monk
0c76295791 Merge "Fix tuner for secondary users" into mnc-dev 2015-08-12 17:59:22 +00:00
Julia Reynolds
3322690871 am a6bce6df: am bcca1fdd: am edf02322: am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev
* commit 'a6bce6df6fb7d904b766d1a754d91321b8a76bba':
  New landscape Navigation bar icons.
2015-08-12 01:54:23 +00:00
Julia Reynolds
a6bce6df6f am bcca1fdd: am edf02322: am b46c2a81: am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev
* commit 'bcca1fdd2469a21264c7697a03074476bd1479d2':
  New landscape Navigation bar icons.
2015-08-12 01:44:42 +00:00
Selim Cinek
1ca500cfc2 am 7f07068d: am 8d97651d: am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev
* commit '7f07068df990e88e993e44d58d5c5d4acfbc7171':
  Indicating fingerprint error messages on the bouncer now
2015-08-12 01:28:09 +00:00
Julia Reynolds
b46c2a815b am 77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev
* commit '77b0d6e9f001c5e08fa367bff3b3e501ab36cc77':
  New landscape Navigation bar icons.
2015-08-12 01:25:03 +00:00
Selim Cinek
7f07068df9 am 8d97651d: am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev
* commit '8d97651d15821f0fc767a0f33adb6a051c55162c':
  Indicating fingerprint error messages on the bouncer now
2015-08-12 01:20:06 +00:00
Selim Cinek
cfafe4ea6f Indicating fingerprint error messages on the bouncer now
Also ensure that error messages are surfaced when the screen
comes on such that the user knows why his fingerprint is not
working.

Bug: 22035466
Bug: 22524101
Change-Id: I00b0e833cdb8a3475545ba75b8cb7bf7a419dfd4
2015-08-11 16:37:54 -07:00
Julia Reynolds
fe114b9902 New landscape Navigation bar icons.
Bug: 22855920
Change-Id: I5127c8d0121aa90a1e52da1b51a86bac1c1b2fa1
2015-08-11 15:32:29 -04:00
Jason Monk
540542b417 Fix tuner for secondary users
Bug: 23112000
Change-Id: I52aabdd1f345fb50e2c5015d233f4de3cc8d994d
2015-08-11 14:21:52 -04:00
Daniel Sandler
ef00638754 am 5e3e4f9b: am 49ae8f2e: am d7468176: am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev
* commit '5e3e4f9b5832c4ddf3a4ad1944622966351e6ffe':
  Crash apps with bad notification icons.
2015-08-11 14:49:49 +00:00
Daniel Sandler
5e3e4f9b58 am 49ae8f2e: am d7468176: am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev
* commit '49ae8f2ef20843514e63aff5378dbdc0644ee0cb':
  Crash apps with bad notification icons.
2015-08-11 14:44:10 +00:00
Daniel Sandler
5bba07eb01 am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev
* commit 'ad7719dea4e8fd34854e4dcc918fc593c4416d82':
  Crash apps with bad notification icons.
2015-08-11 14:22:12 +00:00
Daniel Sandler
ad7719dea4 Merge "Crash apps with bad notification icons." into mnc-dev 2015-08-11 14:17:45 +00:00
Winson Chung
f304c729ee am 641363e8: am bfa04f49: am b12ca163: am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev
* commit '641363e8941f490cda95f9b2f764d51937cd2694':
  Pushing the startActivity before the calls to remove task.
2015-08-11 03:08:31 +00:00
Winson Chung
641363e894 am bfa04f49: am b12ca163: am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev
* commit 'bfa04f4998956e510a935f6514298dcd3d122264':
  Pushing the startActivity before the calls to remove task.
2015-08-11 03:00:44 +00:00
Winson Chung
bc58c9453f am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev
* commit 'c00b1067a05116548a0883e1400a1c4715078797':
  Pushing the startActivity before the calls to remove task.
2015-08-11 02:40:05 +00:00
Winson Chung
c00b1067a0 Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 2015-08-11 02:33:15 +00:00
Jorim Jaggi
2d925a31f4 am 858a929f: am 231bddea: am 1785c097: am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev
* commit '858a929f6e5f9b2e734307dce95da8da982f4be1':
  Don't show fingerprint cancellation messages in keyguard
2015-08-11 02:05:32 +00:00
Jorim Jaggi
858a929f6e am 231bddea: am 1785c097: am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev
* commit '231bddea314003579718f4214bd0bc535c289b05':
  Don't show fingerprint cancellation messages in keyguard
2015-08-11 01:58:24 +00:00
Jorim Jaggi
3767d85caa am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev
* commit 'f8359cfb93e349771388709b160ae1b9d3f880b3':
  Don't show fingerprint cancellation messages in keyguard
2015-08-11 01:39:43 +00:00
Jorim Jaggi
f8359cfb93 Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev 2015-08-11 01:31:56 +00:00
Winson
1df9c3c6bd Pushing the startActivity before the calls to remove task.
- It appears that there is contention between startActivityAsUser() and
  removeTask() (called on two separate threads) which can cause jank when
  a user removes all the tasks from their recents list.  This CL ensures
  that startActivityAsUser() is always run first so it is not blocked
  by the other call (which should be able to run in the background
  uninterrupted).

Bug: 22760556
Change-Id: I7564a2f0e43414686419d3657379bbd0ca6b4152
2015-08-10 15:45:35 -07:00
Dan Sandler
334398105f Crash apps with bad notification icons.
This shouldn't happen, since there are many places where
invalid icons should already have been either fixed (in the
case where there's an .icon but no .mSmallIcon) or rejected
(if they're both null or invalid). But if a notification
makes it all the way to SystemUI without a valid icon, let's
crash the sender.

Bug: 23011305
Change-Id: Ifaebec57d59baa1defb4520178b5815d47ed5712
2015-08-10 16:04:12 -04:00
Jason Monk
fb1a9a5924 am 531969da: am fcb34b41: am 850e5ee1: am a5c0c209: am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev
* commit '531969da9932d4dce87c55718019215be19a7404':
  Initialize network name better in NetworkController
2015-08-10 15:22:28 +00:00
Jason Monk
531969da99 am fcb34b41: am 850e5ee1: am a5c0c209: am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev
* commit 'fcb34b419d816202a48760bfc21e0c67836601e7':
  Initialize network name better in NetworkController
2015-08-10 15:18:40 +00:00
Jason Monk
a5c0c209c5 am 4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev
* commit '4218e46a3263e5ed9d99e600ef9b30cbd24cc861':
  Initialize network name better in NetworkController
2015-08-10 14:56:52 +00:00
Jason Monk
00aa9d4427 Initialize network name better in NetworkController
Initialize current network name to correct value from the
SubscriptionInfo until we get a broadcast about its current state.

Bug: 22212693
Change-Id: I17fa4378cc7a540c81268f8c4d5aa6a505f3ee40
2015-08-10 10:29:47 -04:00
Jason Monk
9b1697cd8f am e0d9fe59: am 635270c5: am a01965e2: am 69a07d40: am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit 'e0d9fe59856241fb34212b4ad160dbc8f76e4343':
  Allow system to disable lockscreen
2015-08-07 23:07:25 +00:00
Jason Monk
e0d9fe5985 am 635270c5: am a01965e2: am 69a07d40: am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit '635270c5b69da17d80da5e165266ba655c12738e':
  Allow system to disable lockscreen
2015-08-07 19:39:54 +00:00
Jason Monk
69a07d401a am 69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit '69ed33087d77e32a1f1475adf00b9d87580960aa':
  Allow system to disable lockscreen
2015-08-07 18:46:58 +00:00
Jason Monk
69ed33087d Merge "Allow system to disable lockscreen" into mnc-dev 2015-08-07 18:40:19 +00:00
Jason Monk
6fc6195f9d am ebf94393: am 2ba9fc1b: am e810b397: am 49541edb: am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev
* commit 'ebf94393221f9ae936b2c1d4ce9c6e0d45eb5b8d':
  Use BluetoothController for status bar icon status
2015-08-07 15:19:26 +00:00
Jason Monk
ebf9439322 am 2ba9fc1b: am e810b397: am 49541edb: am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev
* commit '2ba9fc1ba7b4f1bd19a9254ea280f66770443dc4':
  Use BluetoothController for status bar icon status
2015-08-07 15:09:41 +00:00
Jason Monk
49541edbdb am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev
* commit '77566dd1e15353eb062503767c6e4a354303fd09':
  Use BluetoothController for status bar icon status
2015-08-07 14:44:22 +00:00
Jason Monk
77566dd1e1 Merge "Use BluetoothController for status bar icon status" into mnc-dev 2015-08-07 14:38:29 +00:00
Jason Monk
b978ce7f25 Allow system to disable lockscreen
Even when there is a pin.

Bug: 22920549
Change-Id: Ib84e1c3ac67be0318d4186c66ee582a49969e373
2015-08-07 09:21:51 -04:00
Winson Chung
cf915b7739 am 8da267a2: am 1353b0f5: am 6bf21c3a: am b762a9a5: am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev
* commit '8da267a2f71d65fefe6a0f1d180c5bcd4f745cd1':
  Fixing issue with empty Recents screen.
2015-08-06 22:22:23 +00:00
Winson Chung
8da267a2f7 am 1353b0f5: am 6bf21c3a: am b762a9a5: am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev
* commit '1353b0f5e6494e97e3d41853127bb0fec420792c':
  Fixing issue with empty Recents screen.
2015-08-06 22:17:04 +00:00
Winson Chung
b762a9a579 am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev
* commit 'bb55aa1a93cee91a40b6f5941675682cb6f8a83b':
  Fixing issue with empty Recents screen.
2015-08-06 21:53:03 +00:00
Winson Chung
bb55aa1a93 Merge "Fixing issue with empty Recents screen." into mnc-dev 2015-08-06 21:44:17 +00:00
Jason Monk
7036436014 Use BluetoothController for status bar icon status
Bug: 22819904
Change-Id: I6ca11c57431f8e930a47144090158363175a3b99
2015-08-06 16:43:59 -04:00