Quang Luong
48a8fbbd9c
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
am: 815af2ba6e
...
am: 89a61d9374
Change-Id: I061ec30bc07fd3694b8ab68081b441bfbfb16f6d
2019-07-30 17:41:23 -07:00
Quang Luong
a5c8edb46f
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
am: 5c4a0e3444
...
am: b66a8c86a4
Change-Id: I2cfd0376d60efcc5fd417139bfcb3446a2485871
2019-07-30 17:37:41 -07:00
Quang Luong
dc74124232
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
...
am: 5c4a0e3444
Change-Id: I68a1a9451dda22ab32baf6bae395c0368b1f9b9b
2019-07-30 17:35:06 -07:00
Quang Luong
89a61d9374
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
...
am: 815af2ba6e
Change-Id: Ib5e2be02b8363dca4e129ac2c0aeba03c277ee91
2019-07-30 17:27:19 -07:00
Quang Luong
b66a8c86a4
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
...
am: 5c4a0e3444
Change-Id: Ib5545caea7cce930898c81fc0158877416666f89
2019-07-30 17:26:35 -07:00
Quang Luong
5c4a0e3444
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
...
am: 17908b1e8f
Change-Id: Ie1cdb83f47bac988b93401b3994a096d85333ce6
2019-07-30 17:16:00 -07:00
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
Quang Luong
877d4d6d0a
Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
...
am: 17908b1e8f
Change-Id: I52e92aeffd349ed17f832b34b352f28a6c575ccb
2019-07-30 17:10:59 -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
Antony Sargent
87929ae314
Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
...
am: 5a39d48ab2
Change-Id: Id51073c918d19403b47cc0bf21964a122d6cadf3
2019-07-30 15:58:21 -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
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
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
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
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
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
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