Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
426,487 Commits 3 Branches 0 Tags
5f0e119bdc97febf65e59dd7d45f5ba454d4e146
Commit Graph

426487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerry Chang
5f0e119bdc Merge "Fade away wallpapers when long pulse" into qt-dev am: 14e6d18ec9 
am: b84c0786b2

Change-Id: Iaaf84570a8172ca634422a792fda45087dc09830
 2019-06-24 07:59:30 -07:00
Jerry Chang
7f6c85996b Merge "Fade away wallpapers when long pulse" into qt-dev am: 14e6d18ec9 
am: 5a5e113271

Change-Id: I9196dd2c0fbc8bad5afb16d3b4495b04ca36cef7
 2019-06-24 07:56:58 -07:00
Lucas Dupin
c05ce8e736 Merge "Wake-and-unlock imprevements" into qt-r1-dev 
am: 4a08215328

Change-Id: I77ee856726f9e3ce932115c77733c405e55a2bf9
 2019-06-22 17:25:22 -07:00
Lucas Dupin
d0e314063c Merge "Unregister listeners and reset wake lock" into qt-r1-dev 
am: d5e9e9c874

Change-Id: Ia4a31feae0a9fe8a11c77dfa027e2a7045193539
 2019-06-22 17:23:45 -07:00
Bill Yi
57e1350c65 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 760558e00a -s ours
am skip reason: subject contains skip directive

Change-Id: I70551d8f5c178f65f155d9141b5d129f5114263f
 2019-06-22 17:21:11 -07:00
Jerry Chang
f41712468f Merge "Prevents posting multiple pulse requests at the same time" into qt-r1-dev 
am: 7e5e70df58

Change-Id: Ia4063eab7dbd589b3c4b13bdd1583e3b2e4a5a15
 2019-06-22 17:19:05 -07:00
Kevin Chyn
9b1716fa44 Merge "Dump buffer of authentication events for bugreports" into qt-r1-dev 
am: 62a7af3f50

Change-Id: Icd6c551d9dbd9b12038a04a0f45679259303f4e0
 2019-06-22 17:17:21 -07:00
Jerry Chang
b84c0786b2 Merge "Fade away wallpapers when long pulse" into qt-dev 
am: 14e6d18ec9

Change-Id: I0ee6f6d17990dd423d362e63805eb131bb401b4d
 2019-06-22 17:16:17 -07:00
Jerry Chang
5a5e113271 Merge "Fade away wallpapers when long pulse" into qt-dev 
am: 14e6d18ec9

Change-Id: Ia529dee9e06c48035846d2c112bf2993ac2a7bbc
 2019-06-22 17:16:14 -07:00
Lucas Dupin
4a08215328 Merge "Wake-and-unlock imprevements" into qt-r1-dev 2019-06-22 23:49:50 +00:00
Lucas Dupin
e78794c056 Wake-and-unlock imprevements 
Remove MODE_DISMISS_BOUNCER, simplifying dismissal logic
Never wake-up without unlocking when bypassing

Test: unlock with face from AOD2
Test: unlock with face from LS
Test: unlock with face from bouncer
Test: unlock with face from scrimmed bouncer
Fixes: 135571526
Fixes: 132846921
Change-Id: Id468eab8aeed91b6eeadc8bca3b579f977eac2a6
 2019-06-22 14:15:45 -07:00
TreeHugger Robot
d5e9e9c874 Merge "Unregister listeners and reset wake lock" into qt-r1-dev 2019-06-22 18:46:24 +00:00
TreeHugger Robot
760558e00a Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-22 16:35:23 +00:00
TreeHugger Robot
14e6d18ec9 Merge "Fade away wallpapers when long pulse" into qt-dev 2019-06-22 11:59:49 +00:00
TreeHugger Robot
7e5e70df58 Merge "Prevents posting multiple pulse requests at the same time" into qt-r1-dev 2019-06-22 11:58:41 +00:00
Bill Yi
78e1b4bd5a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I63e4016a8bd2f3d39d3cded18600583936cb4b22
 2019-06-22 01:39:39 -07:00
Kevin Chyn
62a7af3f50 Merge "Dump buffer of authentication events for bugreports" into qt-r1-dev 2019-06-22 08:29:29 +00:00
Android Build Merger (Role)
a615045db0 Merge "[automerger skipped] Merge "Add carrier config for conference participants data support" into qt-dev am: 23b6339ebd -s ours am: 5cb9683fd7 -s ours am skip reason: change_id I88edd5a590f46b961c986ef0bf24585b3c2cf4a1 with SHA1 37ca693d78 is in history" into qt-r1-dev-plus-aosp 2019-06-22 02:03:09 +00:00
Youming Ye
c93fe03275 [automerger skipped] Merge "Add carrier config for conference participants data support" into qt-dev am: 23b6339ebd -s ours 
am: 5cb9683fd7 -s ours
am skip reason: change_id I88edd5a590f46b961c986ef0bf24585b3c2cf4a1 with SHA1 37ca693d78 is in history

Change-Id: Icbf15f0f6ee2781d83e52ca9fc1c07fc08da4054
 2019-06-21 19:01:00 -07:00
Youming Ye
519017ef99 [automerger skipped] Merge "Add carrier config for conference participants data support" into qt-dev am: 23b6339ebd 
am: c6931e3fbb -s ours
am skip reason: change_id I88edd5a590f46b961c986ef0bf24585b3c2cf4a1 with SHA1 37ca693d78 is in history

Change-Id: I4d60ef50bf14870c89f10bce16a77703ad08b59a
 2019-06-21 18:59:59 -07:00
Kevin Chyn
9bc1d495ee Dump buffer of authentication events for bugreports 
Last 100 events, plus total accumulated latencies for accept, reject,
and individual errors since last boot.

Fixes: 134429201

Test: adb shell dumpsys face
Change-Id: Idc34143a8e5de1036bb2d82767cf748c15b74822
 2019-06-21 18:09:24 -07:00
Robert Carr
45db8e4ccc Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev am: 6397ab05f9 
am: 9e4b7a3f8d

Change-Id: I0942e5ec6d01afdfed72b7f273a277c3652292f4
 2019-06-21 17:44:59 -07:00
Robert Carr
52277fd25e Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev am: 6397ab05f9 
am: 641d4f27e3

Change-Id: Ic3bfad9182f677251742ade7c430b8f1205a9e65
 2019-06-21 17:42:23 -07:00
Youming Ye
5cb9683fd7 [automerger skipped] Merge "Add carrier config for conference participants data support" into qt-dev 
am: 23b6339ebd -s ours
am skip reason: change_id I88edd5a590f46b961c986ef0bf24585b3c2cf4a1 with SHA1 37ca693d78 is in history

Change-Id: I83aafdb229133e630c29f658e41da483b7cca44a
 2019-06-21 17:42:16 -07:00
Youming Ye
c6931e3fbb Merge "Add carrier config for conference participants data support" into qt-dev 
am: 23b6339ebd

Change-Id: Id1e5fcf1fbdfe47c73a8e76949ce4d75f03f9ed7
 2019-06-21 17:33:29 -07:00
Robert Carr
641d4f27e3 Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev 
am: 6397ab05f9

Change-Id: I023b06dc785cbf22783a426060aef55714a457d8
 2019-06-21 17:32:54 -07:00
Robert Carr
9e4b7a3f8d Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev 
am: 6397ab05f9

Change-Id: I17feac89670b328f88878ce57636cf4954e0c6f3
 2019-06-21 17:30:57 -07:00
Kevin Chyn
896bcc17f6 Merge "Scale the work profile background properly" into qt-r1-dev 
am: 7473e8fda9

Change-Id: Ie7c80634e16cf02182d38203637b88a267538c75
 2019-06-21 17:24:34 -07:00
Bill Yi
8124aebfac [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: e5039d3c9f -s ours
am skip reason: subject contains skip directive

Change-Id: I48452259f679aa7b686002569b259a9d34ca066a
 2019-06-21 17:17:31 -07:00
TreeHugger Robot
23b6339ebd Merge "Add carrier config for conference participants data support" into qt-dev 2019-06-22 00:12:34 +00:00
TreeHugger Robot
6397ab05f9 Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev 2019-06-22 00:04:19 +00:00
Amit Mahajan
0c1364eb67 Merge "Set mOriginatingAddress and mRecipientAddress separately" am: 44ea78d8ff am: ab90035993 
am: 3d5285c16b

Change-Id: Ie40e27219cc741bdb58fc0e2ac1fa2559d34730c
 2019-06-21 16:52:17 -07:00
Kevin Chyn
7473e8fda9 Merge "Scale the work profile background properly" into qt-r1-dev 2019-06-21 23:51:18 +00:00
Amit Mahajan
3d5285c16b Merge "Set mOriginatingAddress and mRecipientAddress separately" am: 44ea78d8ff 
am: ab90035993

Change-Id: I02833dfbb5af129f326370d9c09968f167fef19e
 2019-06-21 16:46:15 -07:00
TreeHugger Robot
e5039d3c9f Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-06-21 23:45:39 +00:00
Dave Mankoff
4ae5be910d Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-r1-dev 
am: 0cd732ddf3

Change-Id: I8532cd2337ae7f29a7f2ac4111ac347aec470bc8
 2019-06-21 16:40:15 -07:00
Dave Mankoff
e941dd8918 DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType. 
am: 84c07e9f1a

Change-Id: I5e6f899fefef4d667d867bd265873771685c0aa6
 2019-06-21 16:40:12 -07:00
Amit Mahajan
ab90035993 Merge "Set mOriginatingAddress and mRecipientAddress separately" 
am: 44ea78d8ff

Change-Id: Ieb3e2b98cc61fef472fe471ae05bf9db7a9b66ed
 2019-06-21 16:39:09 -07:00
Dave Mankoff
0cd732ddf3 Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-r1-dev 2019-06-21 23:31:19 +00:00
Amit Mahajan
44ea78d8ff Merge "Set mOriginatingAddress and mRecipientAddress separately" 2019-06-21 23:23:12 +00:00
Android Build Merger (Role)
04cd81fda7 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours am: af16a228a2 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-06-21 22:31:39 +00:00
Bill Yi
fa90167dcb [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours 
am: af16a228a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I1035374267cf948c63d087a82a46efd68f870e59
 2019-06-21 15:30:33 -07:00
Bill Yi
40ba79442f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours 
am: 772a340689 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib6d83ef3007e068d3323803ff178afd1c8302b26
 2019-06-21 15:30:17 -07:00
Youming Ye
60b023bfd0 Add carrier config for conference participants data support 
Bug: 132312382
Test: Manual
Change-Id: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
Merged-In: I88edd5a590f46b961c986ef0bf24585b3c2cf4a1
 2019-06-21 22:30:08 +00:00
Android Build Merger (Role)
8f0c3ac7c6 Merge "Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd43 am: b3be57b74c" into qt-r1-dev-plus-aosp 2019-06-21 22:28:36 +00:00
Aran Ink
19c65b97d2 Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd43 
am: b3be57b74c

Change-Id: I4ef494bd9d157fec7aa8e0ae13639534301b98fa
 2019-06-21 15:27:46 -07:00
Aran Ink
49a40df62a Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd43 
am: 43369ea648

Change-Id: I7ae7a7d7d4ad2ea593ef01c6ed03bd161b5d5d0b
 2019-06-21 15:27:42 -07:00
Bill Yi
772a340689 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 019e1bf3fb -s ours
am skip reason: subject contains skip directive

Change-Id: I20dde9516b31187e21f5eb90f7dce45019d1f96e
 2019-06-21 15:21:23 -07:00
Bill Yi
af16a228a2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev 
am: 019e1bf3fb -s ours
am skip reason: subject contains skip directive

Change-Id: Iafb62faea41ec53b7e9f0127f64f9e7a2c6af9f0
 2019-06-21 15:21:21 -07:00
Aran Ink
43369ea648 Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev 
am: 985f21dd43

Change-Id: I3c148d970cb95a4de752270ca6bbe6e5db2d77d1
 2019-06-21 15:18:29 -07:00