PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,730 Commits 1 Branch 0 Tags
d5352c93c84d61838ab0e0b35570e5ec936d3120
Commit Graph

53730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
d5352c93c8 [automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours am: f5c8056f7a -s ours 
am: 3cda841897 -s ours
am skip reason: subject contains skip directive

Change-Id: I30527bdf3fdd856c7ab9399553a7ee44a1ca887f
 2019-07-30 12:02:20 -07:00
Bill Yi
3c98eeecd2 [automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours am: e5dd9176ca -s ours 
am: 88c1e9ff62 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieafa1027cc6a849b36b19e9ac4f713efc36933c7
 2019-07-30 11:49:41 -07:00
Bill Yi
3cda841897 [automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours 
am: f5c8056f7a -s ours
am skip reason: subject contains skip directive

Change-Id: I8d700ef074dff397a3e02cca8945935a549c77df
 2019-07-30 11:47:09 -07:00
Bill Yi
004b9882e7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff -s ours 
am: 1e7de9c312 -s ours
am skip reason: subject contains skip directive

Change-Id: Idc4cf9cadf4845d9c3bb7ccf8bfb4937d9ce9cdd
 2019-07-30 11:46:46 -07:00
Bill Yi
25bfe44ee6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff -s ours 
am: 50dc17d8bc -s ours
am skip reason: subject contains skip directive

Change-Id: Id3dc3d4ff87c952de17cedb925270f098628aeea
 2019-07-30 11:43:42 -07:00
Bill Yi
88c1e9ff62 [automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours 
am: e5dd9176ca -s ours
am skip reason: subject contains skip directive

Change-Id: Ib09846428898767c3745f7b17e81f09de19eda66
 2019-07-30 11:43:41 -07:00
Bill Yi
e5dd9176ca [automerger skipped] Import translations. DO NOT MERGE 
am: 9af3e6a625 -s ours
am skip reason: subject contains skip directive

Change-Id: I30d1996db7f73e5e38515fad56ea9bc9d8f44450
 2019-07-30 11:34:43 -07:00
Bill Yi
50dc17d8bc [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: f63cb669ff -s ours
am skip reason: subject contains skip directive

Change-Id: Ia87ca65aaf5bf3f43c2d15b944bdf06a74f857c6
 2019-07-30 11:32:38 -07:00
Bill Yi
1e7de9c312 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: f63cb669ff -s ours
am skip reason: subject contains skip directive

Change-Id: I3a24b910fa6a98e131419c738600296abdca963b
 2019-07-30 11:32:38 -07:00
Bill Yi
f5c8056f7a [automerger skipped] Import translations. DO NOT MERGE 
am: 9af3e6a625 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic131b3c52fc5f2c0bd1b735a376df65108490f5e
 2019-07-30 11:32:37 -07:00
TreeHugger Robot
f63cb669ff Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-30 18:09:15 +00:00
Antony Sargent
c440f3e823 Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d 
am: 20c9eff53e

Change-Id: I59bc25d70217f9fccc6f367a4429526fdaa8ca77
 2019-07-30 10:17:13 -07:00
Antony Sargent
01028402ca Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d 
am: 42861b21c9

Change-Id: I1b1b85bbdac1e12c51c855686a5c25e5581a40e4
 2019-07-30 10:15:54 -07:00
Antony Sargent
42861b21c9 Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev 
am: 985d3d570d

Change-Id: Ic653102f8f66c0f5e1e3457750cdf150f1dbfd5e
 2019-07-30 09:54:25 -07:00
Antony Sargent
20c9eff53e Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev 
am: 985d3d570d

Change-Id: I02252dd85f3b11aef3109e1a0193faba8bb9c240
 2019-07-30 09:54:25 -07:00
TreeHugger Robot
985d3d570d Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev 2019-07-30 16:41:29 +00:00
Bill Yi
f2e88c8cd7 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie730f2fa36caf0c3d99159cc649ed7e24ca2ceec
 2019-07-29 17:02:13 -07:00
Bill Yi
9af3e6a625 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Idbe888a8bb4d386d7d8e883cc530561c1a5806ad
 2019-07-29 16:46:49 -07:00
Julia Reynolds
104bc8e133 Merge "Move channel listing into a pref controller" into qt-qpr1-dev 
am: 2d035ddfa2

Change-Id: Ie6d1c1ec4fdd2c074884d258379889bdb120a0d4
 2019-07-29 13:24:07 -07:00
TreeHugger Robot
2d035ddfa2 Merge "Move channel listing into a pref controller" into qt-qpr1-dev 2019-07-29 18:42:25 +00:00
Julia Reynolds
f2c967c225 Merge "Fix launching of work profile notif settings" into qt-qpr1-dev 
am: 0805e3d641

Change-Id: Ib221648a434d2d2d50a905971567792f23aa8b2c
 2019-07-28 20:21:51 -07:00
TreeHugger Robot
0805e3d641 Merge "Fix launching of work profile notif settings" into qt-qpr1-dev 2019-07-29 02:28:37 +00:00
Android Build Merger (Role)
14dfab3981 Merge "Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev am: 04ad8c905a am: 3ed75c8478" into qt-qpr1-dev-plus-aosp 2019-07-27 01:55:47 +00:00
Jason Chiu
8585fd6c85 Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev am: 04ad8c905a 
am: 3ed75c8478

Change-Id: I5b755e0e4442e3b30cf1314dfb3a1fd4c8ca676d
 2019-07-26 18:55:07 -07:00
Jason Chiu
409e4bc475 Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev am: 04ad8c905a 
am: f7423fd7ac

Change-Id: Ic35bc76eee1107a64ca83252738cb54adc939b92
 2019-07-26 18:55:05 -07:00
Jason Chiu
f7423fd7ac Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev 
am: 04ad8c905a

Change-Id: Id2ee2415fffd70bcf94aa2a305125d983ae5bd9e
 2019-07-26 18:45:07 -07:00
Jason Chiu
3ed75c8478 Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev 
am: 04ad8c905a

Change-Id: I2c87041fb5575dfd621f4a9539653342c75d544f
 2019-07-26 18:44:26 -07:00
TreeHugger Robot
04ad8c905a Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev 2019-07-27 01:29:55 +00:00
Android Build Merger (Role)
dc0a2a6100 Merge "[automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours am: 587d8d7005 -s ours am: 9f395fd0a9 -s ours am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history" into qt-qpr1-dev-plus-aosp 2019-07-27 01:28:45 +00:00
Kevin Chyn
b8d792d59c [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours am: 587d8d7005 -s ours 
am: 9f395fd0a9 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: I113a7b6214ce73864b6d9437eaabafb1063c69ee
 2019-07-26 18:28:30 -07:00
Kevin Chyn
adb95d23b2 [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours am: 587d8d7005 -s ours 
am: 32a9b548e3 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: Iebd57656a9456105f13a8d9de44ded0a4f1e29df
 2019-07-26 18:28:17 -07:00
Android Build Merger (Role)
c7c8efed8a Merge "Add ability to finish() ConfirmDeviceCredential if it loses foreground am: e27a304b97 am: 10fe104f06" into qt-qpr1-dev-plus-aosp 2019-07-27 01:27:23 +00:00
Kevin Chyn
c68f9576c9 Add ability to finish() ConfirmDeviceCredential if it loses foreground am: e27a304b97 
am: 10fe104f06

Change-Id: I55dac777f7f8abf0b5a41a4e8bc02868130fea51
 2019-07-26 18:27:03 -07:00
Kevin Chyn
bdebaf4396 Add ability to finish() ConfirmDeviceCredential if it loses foreground am: e27a304b97 
am: 7baab69bdc

Change-Id: I46b98ccd554566433c1d11272677894960fd2d16
 2019-07-26 18:26:47 -07:00
Kevin Chyn
890b5c416d [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 am: 1c1191b640 -s ours 
am: c919df9edb -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: I11ceedfa9003dd22ef6dcd23ad618241f9925aec
 2019-07-26 18:25:30 -07:00
Kevin Chyn
32a9b548e3 [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours 
am: 587d8d7005 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: I14cf7941c761c973d6c9297d366c213aeae4cbcf
 2019-07-26 18:15:41 -07:00
Kevin Chyn
9f395fd0a9 [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 -s ours 
am: 587d8d7005 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: I2ed1d97f1fa5104e1c381babc2625cb69b147b6c
 2019-07-26 18:14:54 -07:00
Kevin Chyn
7baab69bdc Add ability to finish() ConfirmDeviceCredential if it loses foreground 
am: e27a304b97

Change-Id: Ie695769418adfd316d608a2e23ed45e7237d28ce
 2019-07-26 18:14:19 -07:00
Kevin Chyn
10fe104f06 Add ability to finish() ConfirmDeviceCredential if it loses foreground 
am: e27a304b97

Change-Id: Idcc2dab10c42016f0f440cbf495974bf3ee1ba94
 2019-07-26 18:13:32 -07:00
Kevin Chyn
c919df9edb [automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650 
am: 1c1191b640 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: I662181a2cfd7b05c9929b868e2b76895f407678c
 2019-07-26 18:09:34 -07:00
Kevin Chyn
587d8d7005 [automerger skipped] Do not request cancel authentication unless currently authenticating 
am: 49c7d07650 -s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17 is in history

Change-Id: If5e6d4c715b0c3482f297c709320e2ca9f6fa209
 2019-07-26 17:50:13 -07:00
Kevin Chyn
1c1191b640 Do not request cancel authentication unless currently authenticating 
am: 49c7d07650

Change-Id: Id38d3648f75a79a3492677416c79fff960317a69
 2019-07-26 17:48:44 -07:00
Kevin Chyn
e27a304b97 Add ability to finish() ConfirmDeviceCredential if it loses foreground 
If user enters face settings but does not enter the password, then
turns off the screen, it's possible the challenge is invalidated. Instead,
we should finish() the device credential screen as well as FaceSettings.

This prevents
1) The user from being prompted for credential with lack of context
2) Credential returning a HAT that wraps an invalidated challenge

The user will be returned to the security settings screen, where they
have more context and can decide if they want to enter face settings again.

Fixes: 138273242

Test: 1) Open face settings, do not enter password
      2) Press power button
      3) Unlock keyguard
      4) User is not presented with credential screen
Test: Go through SUW, turning on/off the screen at various security
      screens. Able to enroll successfully

Change-Id: I3c3d4600138012821bb0eea7d2927df00011cdb0
 2019-07-26 16:42:14 -07:00
Android Build Merger (Role)
6d3614f8f0 Merge "Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d am: 6fdc3745c3" into qt-qpr1-dev-plus-aosp 2019-07-26 19:46:32 +00:00
Kevin Chyn
fa1aea0847 Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d 
am: 6fdc3745c3

Change-Id: I79ffdd76bf57df0bf7ba0ef0b5c4a815f2623f00
 2019-07-26 12:46:09 -07:00
Kevin Chyn
75517cb6a8 Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev am: ba4fad160d 
am: 6d549437af

Change-Id: If055528ab0d92318fc552c2396465cecd8e5acea
 2019-07-26 12:45:44 -07:00
Kevin Chyn
6fdc3745c3 Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev 
am: ba4fad160d

Change-Id: Iea3b2552097a1decd9dc106e3a31d71d772ab1d6
 2019-07-26 12:35:33 -07:00
Kevin Chyn
6d549437af Merge "Do not request cancel authentication unless currently authenticating" into qt-r1-dev 
am: ba4fad160d

Change-Id: Ie71d66f43e21821b0ccac003d02878f011e63f18
 2019-07-26 12:35:30 -07:00
Julia Reynolds
c400ce3c80 Move channel listing into a pref controller 
And a hidden preference category. This makes
hiding/showing the list a lot cleaner and also allows more
of the code to be tested.

Also delete some unused code that no longer complied after
this refactor.

Fixes: 133443871
Test: atest
Change-Id: I4a5fe0e075019bae2df44a0a9dcec26a40ee6d12
(cherry picked from commit a295d71c94)
 2019-07-26 19:24:43 +00:00
Julia Reynolds
19c4ea4da1 Fix launching of work profile notif settings 
Test: manual
Fixes: 132289017
Change-Id: I3c177aae1f4dd46556b652253d24b225d01987eb
(cherry picked from commit 142920e0c2)
 2019-07-26 19:24:17 +00:00