PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,908 Commits 1 Branch 0 Tags
9d49e1b51ff357fc499d027ea993e5c7a66fca5c
Commit Graph

54908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
45adb0424f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours am: c7b0ab4b49 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-07-30 22:57:55 +00:00
Bill Yi
57acbbb58e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours 
am: c7b0ab4b49 -s ours
am skip reason: subject contains skip directive

Change-Id: I8d05e0299e7f5373cac940f1c2a9eee1592a5f8a
 2019-07-30 15:57:29 -07:00
Bill Yi
2a3d4009df [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours 
am: 1b86d59384 -s ours
am skip reason: subject contains skip directive

Change-Id: I420655e2749fafc0543cc7f8aa79af1d43f17edc
 2019-07-30 15:57:27 -07:00
Bill Yi
7543f194d4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617 -s ours 
am: 1b86d59384 -s ours
am skip reason: subject contains skip directive

Change-Id: I2aa2952eec13d8c7fcb0ae1eeb437e780ef8c818
 2019-07-30 15:57:25 -07:00
Antony Sargent
d188932f64 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev 
am: 66208e734b

Change-Id: I0123b5872e6a55f8c39ce4e07c0b740170178915
 2019-07-30 15:45:19 -07:00
Bill Yi
fa1dbc007b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 67afe87617 -s ours
am skip reason: subject contains skip directive

Change-Id: I93b1d7c914e939f3a33676bb8baed83da547bdb5
 2019-07-30 15:44:28 -07:00
Antony Sargent
5a39d48ab2 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev 
am: 66208e734b

Change-Id: I7e1494a1859393844ad5810a9721bf3865ed5f75
 2019-07-30 15:43:32 -07:00
Antony Sargent
9e58a8df39 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev 
am: 66208e734b

Change-Id: Ifb4c387a8663fda3a642b03b68777079d1c5a619
 2019-07-30 15:43:32 -07:00
Bill Yi
c7b0ab4b49 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 67afe87617 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaf9f87ae5aab01ba07c15825d8551460ae810354
 2019-07-30 15:42:26 -07:00
Bill Yi
1b86d59384 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 67afe87617 -s ours
am skip reason: subject contains skip directive

Change-Id: I253e0acc117f894554878c91ba084cca775eb7bd
 2019-07-30 15:42:25 -07:00
TreeHugger Robot
66208e734b Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev 2019-07-30 22:33:32 +00:00
TreeHugger Robot
67afe87617 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-30 21:39:43 +00:00
TreeHugger Robot
64d8aedc04 Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev 2019-07-30 19:32:23 +00:00
Antony Sargent
6d910e8608 Make EnabledNetworkModePreferenceController listen to setting changes 
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.

Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
 2019-07-30 12:30:19 -07:00
Bill Yi
d8700db7c7 [automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours am: f5c8056f7a -s ours 
am: f72e0eeddd -s ours
am skip reason: subject contains skip directive

Change-Id: Ieef6bd24286c4f9ce5130a1771931d8dbf24b786
 2019-07-30 12:15:57 -07:00
Bill Yi
20d501562e [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: I8670a31858f74816775f9ca91e799e08719d7284
 2019-07-30 12:03:57 -07:00
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
0501bbb97f Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

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

Change-Id: Ia98dea474d8c568821fe7612181a039f48bf9580
 2019-07-30 11:53:10 -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
7e31de784c [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: I594fbdb0e5eea0247dfa12fd5eff51677627e41c
 2019-07-30 11:43:40 -07:00
Bill Yi
969175bc68 [automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625 -s ours 
am: f5c8056f7a -s ours
am skip reason: subject contains skip directive

Change-Id: I2c8ab98e3bddd57716190bc43bf71db2b62d0d05
 2019-07-30 11:34:47 -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
44046cc33c [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: If7d866dafc18cd4d97f613fcbfb59b062a11ba99
 2019-07-30 11:33:38 -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
28f6c96822 Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d 
am: 42861b21c9

Change-Id: I0f3fae2daf7c5df5985e2fd6597fdf563fdb095c
 2019-07-30 10:28:26 -07: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
12a04d695e Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev 
am: 985d3d570d

Change-Id: If1eb34ad104dd55cf749bd2fabdca4fed16f93dc
 2019-07-30 10:05:31 -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
88ba8eadff Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic7e4a4b15d2cbb88cc6c27c14fe41c1d0dd852fe
 2019-07-29 17:32:38 -07: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
Julia Reynolds
cfe218cf43 Merge "Move channel listing into a pref controller" into qt-qpr1-dev 
am: 2d035ddfa2

Change-Id: Ice7a48d0fdad00b8d1f09a1da1fe39d5a8d85e79
 2019-07-29 13:23:00 -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-team Robot
19ffddb811 Merge cherrypicks of [9007561, 9007562, 9007563, 9007600, 9007801, 9007895, 9007389] into qt-release 
Change-Id: Ib68db973c7a9b5875ecd65bcb683793978020065
 2019-07-28 22:26:53 +00:00
Kevin Chyn
adef4840f3 Do not request cancel authentication unless currently authenticating 
Currently we always send cancel() if ConfirmDeviceCredentialActivity
goes into the background. However, if the biometric state is no longer
authenticating, requesting cancel() in this state will result in an
inconsistent state between BiometricService/client and
ConfirmDeviceCredentials.

BiometricService/client will receive the ERROR_CANCELED message incorrectly,
while ConfirmDeviceCredential is showing / pending user password. When
the password is entered, its result is ignored.

The correct behavior is for ConfirmDeviceCredentialActivity to invoke
cancel() only if it's still authenticating. Otherwise BiometricService
and its client will receive ERROR_CANCELED, instead of the actual password
auth result.

Bug: 138279856

Test: BiometricPromptDemo, enable device credential fallback, get into
      lockout state, successfully enter password. API result is
      success instead of "canceled" now.

Change-Id: I6521e896d0402fe856dc85476f51149c9b3084a8
Merged-In: I6521e896d0402fe856dc85476f51149c9b3084a8
(cherry picked from commit 49c7d07650)
 2019-07-28 22:26:26 +00:00
android-build-team Robot
34e21e206a Snap for 5761090 from 04ad8c905a to qt-c2f2-release 
Change-Id: I7d4bee917ccbbc7b6ca9a4a0471a03a9f874778b
 2019-07-27 23:09:10 +00:00