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

35391 Commits

Author SHA1 Message Date
Evan Rosky
308b62b659 Merge "Post setSwitchingUser to main thread" into oc-dev am: 775699dc05 
am: 6c16bc5711

Change-Id: Ib1cd87d2c8b23eb620aa06bf2a64d65be3206891
 2017-05-15 21:29:50 +00:00
Evan Rosky
6c16bc5711 Merge "Post setSwitchingUser to main thread" into oc-dev 
am: 775699dc05

Change-Id: If7fcaf4209f0ea1ff31030bffad87c7a343c142b
 2017-05-15 21:12:19 +00:00
Kevin Chyn
530658fc86 Merge "Keyguard shouldn't listen to FP if bouncer showing and keyguard dismissing" into oc-dev 
am: 4be9b2ca3e

Change-Id: Icc4dcc08a2cc62872ae1b017ebf5c724a7003336
 2017-05-15 21:04:59 +00:00
Evan Rosky
775699dc05 Merge "Post setSwitchingUser to main thread" into oc-dev 2017-05-15 20:52:45 +00:00
TreeHugger Robot
4be9b2ca3e Merge "Keyguard shouldn't listen to FP if bouncer showing and keyguard dismissing" into oc-dev 2017-05-15 20:52:28 +00:00
Geoffrey Pitsch
37ac101423 Merge "Center switch vertically with primary text" into oc-dev am: 4b2cecbb53 
am: b07f6932bf

Change-Id: Ibbaa8524ce79b04d5469edd0d2369ac0e103fe46
 2017-05-15 20:26:40 +00:00
Geoffrey Pitsch
b07f6932bf Merge "Center switch vertically with primary text" into oc-dev 
am: 4b2cecbb53

Change-Id: I07e16d38defe17b09d24bb8f19994564773e0540
 2017-05-15 20:17:55 +00:00
TreeHugger Robot
4b2cecbb53 Merge "Center switch vertically with primary text" into oc-dev 2017-05-15 20:11:04 +00:00
Winson Chung
863b7fea83 Merge "Ensure that we check against the pending state while suspended." into oc-dev am: 70a8e86918 
am: 1b7f4b3ce2

Change-Id: I85d75bbefaa02ec5b36741c4c5d9dba49fd5a483
 2017-05-15 19:50:24 +00:00
Winson Chung
1b7f4b3ce2 Merge "Ensure that we check against the pending state while suspended." into oc-dev 
am: 70a8e86918

Change-Id: Iadf91f728260c235255a79871e6a5f9d3b884de2
 2017-05-15 19:41:59 +00:00
Winson Chung
70a8e86918 Merge "Ensure that we check against the pending state while suspended." into oc-dev 2017-05-15 19:31:13 +00:00
Kevin Chyn
6db7d5fc84 Keyguard shouldn't listen to FP if bouncer showing and keyguard dismissing 
There's a race condition if user unlocks from bouncer and an app underneath
uses FP does onResume()

If a user has an application that's authenticating via FP underneath
keyguard and the user dismisses keyguard via bouncer, the app underneath
will get kicked out since onKeyguardVisibilityChanged(false) calls
shouldListenForFingerprint() during this race.

Keyguard shouldn't listen to FP if bouncer is showing but keyguard is
dismissing

Fixes: 37967985
Test: 1) open FP settings
2) enter keyguard and go to bouncer
3) unlock keyguard via pin/pattern/password (NON FP method)
4) tap any finger on sensor (should vibrate)

Merged-In: Ie38d55e6a1ec9b49f9df0c7520d0bc451315c161
Change-Id: Ie38d55e6a1ec9b49f9df0c7520d0bc451315c161
 2017-05-15 18:11:23 +00:00
TreeHugger Robot
ef66f19128 Merge "Keyguard shouldn't listen to FP if bouncer showing and keyguard dismissing" 2017-05-15 18:10:07 +00:00
Evan Rosky
4e44fcedad Post setSwitchingUser to main thread 
touching view hierarchy should only occur on UI thread

Bug: 37167272
Test: keyguard still works, used Log to see that switching
      still gets called
Change-Id: I45ed9894a8f08c38da40de44f84e99cddb683014
 2017-05-15 10:21:15 -07:00
Jonathan Solnit
91d199a391 Merge "Add camera lift trigger to GestureLauncherService" 2017-05-15 16:20:42 +00:00
TreeHugger Robot
db0a4f21e3 Merge "Remove unused slash animations" 2017-05-15 15:59:53 +00:00
Geoffrey Pitsch
747f25ccf3 Center switch vertically with primary text 
Fixes: 38248336
Test: manual
Change-Id: I48bfb244abff47c16ca1f24c0027448a2a238015
 2017-05-15 11:23:17 -04:00
Geoffrey Pitsch
9f71f5b407 Merge "Fix number of channels in inline notification settings" into oc-dev am: 1ab1da3f25 
am: 04f57e2d50

Change-Id: Icdd4c0c75cda5c290f035ea52ff175b9e2c9e6e7
 2017-05-15 14:29:57 +00:00
Geoffrey Pitsch
04f57e2d50 Merge "Fix number of channels in inline notification settings" into oc-dev 
am: 1ab1da3f25

Change-Id: Iae226f9da2ff9f4ee63945c41d6f9ad1685d8286
 2017-05-15 14:24:25 +00:00
TreeHugger Robot
1ab1da3f25 Merge "Fix number of channels in inline notification settings" into oc-dev 2017-05-15 14:18:22 +00:00
Hugo Benichi
f0223b1fa8 Merge "CaptivePortal: login activity UI improvements" into oc-dev 2017-05-15 04:35:48 +00:00
TreeHugger Robot
63a41f4e5c Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-15 04:24:04 +00:00
TreeHugger Robot
3e3fc9ec6f Merge "Import translations. DO NOT MERGE" 2017-05-15 04:15:30 +00:00
Hugo Benichi
a3dfd628ca Merge "CaptivePortal: login activity UI improvements" am: cb570ec50a am: 95e0e08f61 am: 2bf886d648 
am: b15a70deb4

Change-Id: I77c6e2c062d9c6b73f976b74b6c6fd3b94f5ee4c
 2017-05-15 02:40:52 +00:00
Hugo Benichi
b15a70deb4 Merge "CaptivePortal: login activity UI improvements" am: cb570ec50a am: 95e0e08f61 
am: 2bf886d648

Change-Id: I41c965f920911cac9d858f88fcc59b7b78fdef53
 2017-05-15 02:32:21 +00:00
Hugo Benichi
2bf886d648 Merge "CaptivePortal: login activity UI improvements" am: cb570ec50a 
am: 95e0e08f61

Change-Id: I59a4d6daa591e577b6fd8e421c4f8fa5e26224d3
 2017-05-15 02:26:44 +00:00
Hugo Benichi
95e0e08f61 Merge "CaptivePortal: login activity UI improvements" 
am: cb570ec50a

Change-Id: I5ee0a2dbbb36e66822f4539f6b186df23a7438da
 2017-05-15 02:18:47 +00:00
Hugo Benichi
94c5fb342b CaptivePortal: login activity UI improvements 
Similarly to commit 2e0915f14384901f25a41d698b39ef0add201550 for the
carrier portal login, this patch changes the default settings of the
webview used for the system captive portal login activity to allow
better user experience on "wide" login pages designed for desktop.

Test: manually tested with captive portals.
Bug: 31813936, 19228946, 36532213
Change-Id: Ib84fd351e47e951d24f297bc7de1b035b51cf24f
Merged-In: I2579994da37f3b0f4c08e24e59c81f31835ab832

(cherry picked from commit f7eea406c950e447608c6f62de05158334682365)
 2017-05-15 02:10:12 +00:00
Hugo Benichi
cb570ec50a Merge "CaptivePortal: login activity UI improvements" 2017-05-15 02:08:49 +00:00
Jason Monk
780ae3595c Merge "Fix the status icon colors in QS" into oc-dev am: d472349229 
am: e093068eb1

Change-Id: I2bbe4b8dc4f0e9173d00129e8b25a4ccb3977188
 2017-05-13 13:22:13 +00:00
Jason Monk
e093068eb1 Merge "Fix the status icon colors in QS" into oc-dev 
am: d472349229

Change-Id: I052e36141f36ed48ae9b60d210efd9be7bd4cc2b
 2017-05-13 13:16:50 +00:00
Jorim Jaggi
56cf9ad1b0 Merge changes I7b5504d0,I10c263dc into oc-dev am: 8902bbe4e3 
am: ae8e0149cf

Change-Id: Ibb220dc05fcf2713943bdd1287e46b896f4d2df6
 2017-05-13 13:12:22 +00:00
Jason Monk
d472349229 Merge "Fix the status icon colors in QS" into oc-dev 2017-05-13 13:10:58 +00:00
Jorim Jaggi
ae8e0149cf Merge changes I7b5504d0,I10c263dc into oc-dev 
am: 8902bbe4e3

Change-Id: I6cabb34e39f60ad2c952cb5f5972d0853c48ee49
 2017-05-13 13:03:18 +00:00
TreeHugger Robot
8902bbe4e3 Merge changes I7b5504d0,I10c263dc into oc-dev 
* changes:
  Get rid of a lot of binder calls
  Fix recents entry delay
 2017-05-13 12:57:23 +00:00
Bill Yi
1dad0758d0 Import translations. DO NOT MERGE 
Change-Id: I4c22a6f78ff012791677fe6935351f008108dcb9
Auto-generated-cl: translation import
 2017-05-13 04:11:12 -07:00
Jorim Jaggi
ddb449efd9 Get rid of a lot of binder calls 
Lead to delays when entering recents.

Test: Open recents
Bug: 32668632
Change-Id: I7b5504d0c11208d9c4d55de2eace6407d186f25c
 2017-05-13 12:34:25 +02:00
Jorim Jaggi
44f4bcb80d Fix recents entry delay 
- Start loading things after we drew our first frame.
- Don't load high res task until low res tasks have been loaded:
In case the snapshot is already in cache in system_server the
low-res task loader will load the full res snapshot, leading to
GC pressure due to registerNativeAlloc. Now, if both task loader
load the same snapshot at the same time we are very likely
to trigger a blocking GC alloc.

Test: Open recents, look at systrace
Change-Id: I10c263dc8929742611ad9fbb32f65bc8ac3100bd
Fixes: 36851903
Bug: 32668632
 2017-05-13 12:33:59 +02:00
TreeHugger Robot
605351c56c Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-13 06:39:19 +00:00
Bryce Lee
3ebf17dcb4 Merge "Introduce result ranges for activity start return results." into oc-dev am: b3d265caaa 
am: eb651bbfb6

Change-Id: I43ecf09dac5dd6142dba08f8bcdd1332f44d4aa2
 2017-05-13 02:00:36 +00:00
Bryce Lee
eb651bbfb6 Merge "Introduce result ranges for activity start return results." into oc-dev 
am: b3d265caaa

Change-Id: I609d209e8a5a8dc0ce936c9ac644f9a128c5d641
 2017-05-13 01:49:28 +00:00
Bryce Lee
b3d265caaa Merge "Introduce result ranges for activity start return results." into oc-dev 2017-05-13 01:41:36 +00:00
Jonathan Solnit
a41381660c Add camera lift trigger to GestureLauncherService 
Add registration for the camera lift trigger sensor and handling for its
events to GestureLauncherService

Test: Confirmed camera launches on lift gesture if setting is enabled
(and other pieces are in place)
Change-Id: Ibfad2040409d86af2d019e2ce97ab546bef9ba78
 2017-05-12 17:59:27 -07:00
Winson Chung
a4bd283abb Merge "Updating expand icon asset." into oc-dev am: 54a3d22cfb 
am: 1df285597a

Change-Id: Id1afcfdc9e012d53eee1655f986ad21146b4f278
 2017-05-13 00:40:30 +00:00
Winson Chung
1df285597a Merge "Updating expand icon asset." into oc-dev 
am: 54a3d22cfb

Change-Id: I13747eb74b5535fe3a2f373a12336640c31bd9f7
 2017-05-13 00:19:42 +00:00
TreeHugger Robot
54a3d22cfb Merge "Updating expand icon asset." into oc-dev 2017-05-13 00:14:03 +00:00
Selim Cinek
919615e60e Merge "Fixed an issue where the media notification wouldn't have contrast" into oc-dev am: 0ac4b7d108 
am: 02f135e8b2

Change-Id: I69fa213e97113508a002e75203871b2e1cf914aa
 2017-05-13 00:08:56 +00:00
Kevin Chyn
f8567234e0 Merge "strong fp lockout after 20 failed attempts" into oc-dev am: 310818ff82 
am: 3ed8955aa3

Change-Id: Id8de8c421f31faa6ec30a8bd1e8d5d2585642363
 2017-05-13 00:03:18 +00:00
Selim Cinek
02f135e8b2 Merge "Fixed an issue where the media notification wouldn't have contrast" into oc-dev 
am: 0ac4b7d108

Change-Id: If9ece630645f4ebd3e1ee9e62ed2490d32e21082
 2017-05-12 23:56:15 +00:00
Kevin Chyn
3ed8955aa3 Merge "strong fp lockout after 20 failed attempts" into oc-dev 
am: 310818ff82

Change-Id: I52787e3db92ae9795932156335ee5c55f5c920a9
 2017-05-12 23:49:48 +00:00