Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,739 Commits 1 Branch 0 Tags
45adb0424f9155a98e9edf2b5489c0b4f3c44e3a
Commit Graph

53739 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
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
67afe87617 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-07-30 21:39:43 +00: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
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
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