Quang Luong
815af2ba6e
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
...
am: 17908b1e8f
Change-Id: I0adf1cc87a31b4daa762baf67e2e99415b35491a
2019-07-30 17:12:17 -07:00
TreeHugger Robot
17908b1e8f
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
2019-07-30 23:33:22 +00:00
Antony Sargent
2027cdd830
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
am: 9e58a8df39
...
am: 2640dd028e
Change-Id: I9ca68545e70ae8b503c2b0e318aa44e71e6fdb9f
2019-07-30 16:13:21 -07:00
Antony Sargent
74023e3057
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
am: 5a39d48ab2
...
am: 96c01305b2
Change-Id: Ife5f1280f1a4bc23223c862d97b1b4750a4c4575
2019-07-30 16:12:23 -07:00
Bill Yi
5f6bb63c21
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617
-s ours am: c7b0ab4b49
-s ours
...
am: 45adb0424f
-s ours
am skip reason: subject contains skip directive
Change-Id: Id02aeeec25df62c74c779e119da2ca3dd5ee62ea
2019-07-30 16:11:30 -07:00
Bill Yi
79c4163833
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 67afe87617
-s ours am: 1b86d59384
-s ours
...
am: 2a3d4009df
-s ours
am skip reason: subject contains skip directive
Change-Id: I6ffe2e1a27305887b7ad8be4a07e918b0855f61a
2019-07-30 16:09:54 -07:00
Antony Sargent
2640dd028e
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
...
am: 9e58a8df39
Change-Id: Ie592b8f8639d1a29b1eb26f9979b55e1a895b02e
2019-07-30 15:59:27 -07:00
Antony Sargent
96c01305b2
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
...
am: 5a39d48ab2
Change-Id: I997f4cacaed95a2cc77af01cebc6d4452368d05e
2019-07-30 15:58:36 -07:00
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
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
1a409b97fe
Merge "Import translations. DO NOT MERGE"
2019-07-30 21:33:53 +00:00
Bill Yi
c2c7c9703c
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625
-s ours am: f5c8056f7a
-s ours am: f72e0eeddd
-s ours
...
am: d8700db7c7
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie297e9f68ef3fd199b40bd7de10975c22a628a5c
2019-07-30 12:43:55 -07: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
4c9c6c165e
[automerger skipped] Import translations. DO NOT MERGE am: 9af3e6a625
-s ours am: f5c8056f7a
-s ours am: 3cda841897
-s ours
...
am: d5352c93c8
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic4ed4fa9ec22b4042f7a5bfd9080613ccabf0262
2019-07-30 12:13:58 -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
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
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