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
eca2820d2e
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625
-s ours am: e5dd9176ca
-s ours am: 88c1e9ff62
-s ours
...
am: 3c98eeecd2
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic59a29824b62dca48ec1a65287fc05303417b00f
2019-07-30 11:59:39 -07:00
Bill Yi
396b42ed0c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff
-s ours am: 1e7de9c312
-s ours
...
am: 004b9882e7
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib41894386f8fb461c6f017edaa50505a56a5e843
2019-07-30 11:58:31 -07:00
Bill Yi
27799faff4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f63cb669ff
-s ours am: 50dc17d8bc
-s ours
...
am: 25bfe44ee6
-s ours
am skip reason: subject contains skip directive
Change-Id: I010cbf748db824b397032e8e7601997fed63feec
2019-07-30 11:56:45 -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
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
9e44a20c8c
Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d
am: 20c9eff53e
...
am: c440f3e823
Change-Id: I1d75fd9e3c413340128049ba343540d1a6997e12
2019-07-30 10:47:57 -07:00
Antony Sargent
0e6bbac235
Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d
am: 42861b21c9
...
am: 01028402ca
Change-Id: Iad136b22b968e3a454944d090ae0d6594669f1da
2019-07-30 10:43:38 -07: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
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
Raff Tsai
88228c3399
Fix Settings crash when click uninstall button
...
When mPackageName is null, mFinish is true. OnResume() doesn't
invoke refreshUI(). It causes uninstall button is still enabled.
The solution is hiding AppButtonsPreference when mFinish is true.
Fixes: 138524326
Test: make RunSettingsRoboTests ROBOTEST_FILTER
Change-Id: I9759e53f002afbd4c88d8d536df3bf01c343135e
2019-07-30 11:18:09 +08:00
Kevin Chang
3cb76abd05
Merge "Add gesture navigation setting into a11y settings"
2019-07-30 01:04:13 +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
Bill Yi
d1251b2633
Import translations. DO NOT MERGE
...
Change-Id: I29f067761387831145818b0475ca8edd601cc648
Auto-generated-cl: translation import
2019-07-29 16:31:34 -07:00
Julia Reynolds
179bfafd20
Merge "Move channel listing into a pref controller" into qt-qpr1-dev am: 2d035ddfa2
...
am: 104bc8e133
Change-Id: I0bad9abc21f330aaf22142e8f7333d5177f40f6a
2019-07-29 13:40:40 -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
cd87fa6af7
Merge "Fix launching of work profile notif settings" into qt-qpr1-dev am: 0805e3d641
...
am: f2c967c225
Change-Id: Iab6d9c538a09063d8e5bf7410a4c508a08af652e
2019-07-28 21:11:13 -07: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
TreeHugger Robot
31ef40552b
Merge "[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit - II"
2019-07-27 08:54:26 +00:00
TreeHugger Robot
689a5e91c4
Merge "[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit - I"
2019-07-27 08:39:26 +00:00
Jason Chiu
5a8e01864f
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
...
am: 14dfab3981
Change-Id: I2f336f8d2aac17c89d013d081cf9b8bd586c4c2c
2019-07-26 19:09:37 -07:00
Jason Chiu
3973e79dd4
Merge "Fix DISALLOW_AMBIENT_DISPLAY blocks access to all lock screen display settings" into qt-r1-dev am: 04ad8c905a
am: f7423fd7ac
...
am: 409e4bc475
Change-Id: I7e5552ded8fc30a7e129d339fb8b9eca6deac0a4
2019-07-26 19:08:16 -07: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
Kevin Chyn
ab89958986
Merge "[automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650
-s ours am: 587d8d7005
-s ours am: 9f395fd0a9
-s ours
...
am: dc0a2a6100
-s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17
is in history
Change-Id: I28c41ce475809b99b0a893a86761abcf47214a71
2019-07-26 18:52:02 -07:00
Kevin Chyn
be089e4c3f
[automerger skipped] Do not request cancel authentication unless currently authenticating am: 49c7d07650
-s ours am: 587d8d7005
-s ours am: 32a9b548e3
-s ours
...
am: adb95d23b2
-s ours
am skip reason: change_id I6521e896d0402fe856dc85476f51149c9b3084a8 with SHA1 0a33d62a17
is in history
Change-Id: Iac98d7bba6163e332414cef5e3a1f2f8dbe96cc9
2019-07-26 18:51:15 -07:00
Kevin Chyn
27486f7c4e
Merge "Add ability to finish() ConfirmDeviceCredential if it loses foreground am: e27a304b97
am: 10fe104f06" into qt-qpr1-dev-plus-aosp
...
am: c7c8efed8a
Change-Id: I3784ec4e6911a76ed1096dc1921facc1e1bcb3af
2019-07-26 18:48:34 -07:00
Kevin Chyn
f0e9fb7e02
Add ability to finish() ConfirmDeviceCredential if it loses foreground am: e27a304b97
am: 7baab69bdc
...
am: bdebaf4396
Change-Id: I34626608c014668887e33da40b80585aa5e66d7c
2019-07-26 18:46:38 -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