Zoey Chen
61b66a28d9
Merge "Merge "Fixed NullPointerException" am: 5fb16be925
am: cbe5bbdcd5
am: 456b2bf87b
am: b301288cd7
am: 036496e2d0" into rvc-dev
2020-03-24 09:05:00 +00:00
Automerger Merge Worker
5616f7632b
Merge "Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
am: f47f38c9a2" into rvc-d1-dev-plus-aosp
2020-03-24 08:08:32 +00:00
Arc Wang
b09f4e3d15
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
am: f47f38c9a2
...
Change-Id: I8589a73f1896b121ef5800159af5077e907bfa79
2020-03-24 08:08:28 +00:00
Arc Wang
660cacfa0d
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
am: e446e42d63
...
Change-Id: I9382e4559375d0d77ad206e22e11e3803d829891
2020-03-24 08:08:26 +00:00
Arc Wang
f47f38c9a2
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
...
Change-Id: If075945a85a830f214b2d8a33bdba165593f0705
2020-03-24 07:46:28 +00:00
Arc Wang
e446e42d63
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
...
Change-Id: Ic73404a2c3392f1049786b5601a72316086eb900
2020-03-24 07:46:26 +00:00
Bonian Chen
f9f9cee93e
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600
am: d2f98e4dad
...
Change-Id: I77e9cf330a27c5aaa62d0c7d1d5140cc89323490
2020-03-24 07:37:58 +00:00
Bonian Chen
aec1582388
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600
am: 0a5211a6d5
...
Change-Id: I8942fd2fbced1b249cb9efcf9013f00e7e16b976
2020-03-24 07:37:49 +00:00
Arc Wang
e4b0989766
Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev
...
* changes:
[Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - II
[Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I
2020-03-24 07:25:17 +00:00
Bonian Chen
0a5211a6d5
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600
...
Change-Id: I42831f5540acd25bc6129ca14ad42b1717cf9e98
2020-03-24 07:15:24 +00:00
Bonian Chen
d2f98e4dad
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600
...
Change-Id: Iac958c3fa1bab2de8ea55fe4194590b3275180d5
2020-03-24 07:15:13 +00:00
Bonian Chen
9a0f633600
Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev
2020-03-24 07:03:52 +00:00
Zhen Zhang
3b53b80715
Fix crash in AllInOneTetherSettings when user is not admin
...
When user is not admin, we should skip the setup and tear down
procedures in AllInOneTetherSettings' lifecycle. Also, the switch for
"Hotspot & tethering" on "Network & internet" should be disabled in such
case.
Bug: 151648198
Test: Build and flashed to crosshatch device. Using guest user, the
settings won't crash when using AllInOneTetherSetting and the switch is
disabled.
Change-Id: Ibd2f4111c53b8b9fa6a18504a681a27b966a3c46
2020-03-24 06:58:41 +00:00
Automerger Merge Worker
45f1e0230a
Merge "Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048
am: 437b0b66d4" into rvc-d1-dev-plus-aosp
2020-03-24 06:31:31 +00:00
TreeHugger Robot
f5eac3f0cf
Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048
am: c21f849fe7
...
Change-Id: I2795824b08a4c7943ebb8e19ecbb2cd8cc3cdfa8
2020-03-24 06:31:21 +00:00
TreeHugger Robot
c09d278177
Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048
am: 437b0b66d4
...
Change-Id: If46d413f025717fd9775ade524f191b5712d3967
2020-03-24 06:31:15 +00:00
Treehugger Robot
2b8bde162f
Merge "Fixed NullPointerException" am: 5fb16be925
am: cbe5bbdcd5
am: 456b2bf87b
am: b301288cd7
am: 036496e2d0
...
Bug: 150258187
Change-Id: I6b363bd609d580d547cb59851f5bfaba57ef7154
(cherry picked from commit 7c62cbd97e
)
Merged-In: I6b363bd609d580d547cb59851f5bfaba57ef7154
2020-03-24 06:21:25 +00:00
TreeHugger Robot
437b0b66d4
Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048
...
Change-Id: I15d091a2b9354b2f6039abc5d7f8d26befde577a
2020-03-24 06:09:06 +00:00
TreeHugger Robot
c21f849fe7
Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048
...
Change-Id: Ie488350d8a6ca7016bbaf7ace6bd7aed70568d49
2020-03-24 06:08:49 +00:00
TreeHugger Robot
a33c8e8048
Merge "Update DND people Settings pages" into rvc-dev
2020-03-24 05:56:29 +00:00
Quang Luong
40c4303fb3
Fix Passpoint network details privacy and ssid
...
Allow changing the privacy setting for Passpoint networks, which are
considered subscriptions but not saved networks. Also use getSsid() for
the SSID pref.
Bug: 70983952
Test: manual build and visual verification
Change-Id: I8a4309421b28bccaf2bd62a23dca8cef133d5af1
2020-03-23 21:11:41 -07:00
Bonian Chen
073f483d86
[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API
...
Replace SubscriptionManager#addOnSubscriptionsChangedListener API in
order to compatible with legacy design.
Bug: 151838951
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SubscriptionsChangeListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ActiveSubsciptionsListenerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Change-Id: Ib98ce0dcbf18b6f48a6f267dd9e7be017d571157
2020-03-24 11:51:23 +08:00
Edgar Wang
55ac72eec8
Update App storage usage summary
...
- don't lowercase for Internal Storage and External Storage
Fixes: 150635477
Test: visual & robotest
Change-Id: I0b12ad5ae26fe7b0eb5e970b7945ebcd4bfed017
2020-03-24 11:46:35 +08:00
Rubin Xu
a49f4501eb
Add unit tests for policy transparency on Fact Auth settings
...
Bug: 135747161
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=FaceSettingsLockscreenBypassPreferenceControllerTest
Change-Id: I2cca8b923bad910dd539e346536c8b1537c8d367
2020-03-23 18:58:40 +00:00
TreeHugger Robot
d50c2c9641
Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0
am: 8490a15ad9
...
Change-Id: I519de6e1605ebe201f3332ca69abceaad5c31689
2020-03-23 18:51:28 +00:00
TreeHugger Robot
008ce5e6e0
Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0
am: 3052c27768
...
Change-Id: I71c82452682f81d44e973c700b54f1b968de375e
2020-03-23 18:49:41 +00:00
TreeHugger Robot
8490a15ad9
Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0
...
Change-Id: I93891a124e8237dbb5fe51408ef3b4ceae4d1965
2020-03-23 18:35:57 +00:00
TreeHugger Robot
3052c27768
Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0
...
Change-Id: I852b01136c7313ea2ce274b7508a555b75808a38
2020-03-23 18:35:18 +00:00
TreeHugger Robot
a3fccb9cc0
Merge "Add strings for power menu settings" into rvc-dev
2020-03-23 18:09:37 +00:00
TreeHugger Robot
526ddd391f
Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa
am: 38fab2476f
...
Change-Id: Ie0dca5bae6a0502749b9f3c187738d874a7a9c2d
2020-03-23 17:05:53 +00:00
TreeHugger Robot
fea8da24ee
Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa
am: 7866eddfa5
...
Change-Id: I515f324a16bab7590f0a863e9a04448ab5f1e536
2020-03-23 17:05:16 +00:00
TreeHugger Robot
38fab2476f
Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa
...
Change-Id: Ie994ae2bed19579385b5aa49f9303fc3778ea16a
2020-03-23 16:46:04 +00:00
TreeHugger Robot
7866eddfa5
Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa
...
Change-Id: I7b4cfa9895148b9837be25d19a02d2f7c1c19d1c
2020-03-23 16:45:32 +00:00
TreeHugger Robot
43d9013aaa
Merge "Redesign individual conversation page" into rvc-dev
2020-03-23 16:31:27 +00:00
Mady Mellor
18d11571a9
Merge "String updates" into rvc-dev am: 159538d35a
am: e929e69810
...
Change-Id: I8d272867527271f5c0aa54c42fd6f086c7fdbc7c
2020-03-23 16:23:24 +00:00
Mady Mellor
e07e3b53c8
Merge "String updates" into rvc-dev am: 159538d35a
am: 9559e7d480
...
Change-Id: I66cd7c18b0683a5d39da602036be36a7c55fdca1
2020-03-23 16:22:45 +00:00
Mady Mellor
9559e7d480
Merge "String updates" into rvc-dev am: 159538d35a
...
Change-Id: I267fb8f17a5356c181f1943bef1dc17ffadda650
2020-03-23 16:08:05 +00:00
Mady Mellor
e929e69810
Merge "String updates" into rvc-dev am: 159538d35a
...
Change-Id: I83b0cecb2b975068a6ff5afe6f06114146dc923c
2020-03-23 16:08:01 +00:00
Mady Mellor
159538d35a
Merge "String updates" into rvc-dev
2020-03-23 15:43:29 +00:00
TreeHugger Robot
5b9371950b
[automerger skipped] Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72
am: 6f1ebe6d79
-s ours
...
am skip reason: Change-Id I9c23c558a9d764702e966d22e5c6e5c5425e4d32 with SHA-1 509273cc03
is in history
Change-Id: I628e6eae987ff3998ba4769e25acd034a983e88a
2020-03-23 14:50:00 +00:00
TreeHugger Robot
236330ac81
Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72
am: fae0dc47f8
...
Change-Id: I9a5e16d435a3455ac30d54ccdafb430bd388f4d7
2020-03-23 14:49:22 +00:00
Ben Murdoch
7803f907c7
Move strings related to user creation to SettingsLib.
...
Test: Build, manually check device.
Bug: 147653252
Bug: 152038380
Change-Id: I921d7907eca5c6bd6585f89e5dd5b6b6222bc745
2020-03-23 14:23:23 +00:00
TreeHugger Robot
6f1ebe6d79
Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72
...
Change-Id: I40f114a95b899c28f41ca1f899f0760297eb7953
2020-03-23 14:21:30 +00:00
TreeHugger Robot
fae0dc47f8
Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72
...
Change-Id: I227b803e7758ce75aca409e17ab2cfd6992accc3
2020-03-23 14:19:48 +00:00
TreeHugger Robot
4d4c55ad72
Merge "Updates main page for Do Not Disturb" into rvc-dev
2020-03-23 14:01:46 +00:00
Fabian Kozynski
03b66becf6
Add strings for power menu settings
...
Test: build
Bug: 152053344
Change-Id: I601037113a3191b814c5f65647fe0e520d9081ad
2020-03-23 09:53:19 -04:00
TreeHugger Robot
3f991e0778
Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c
am: b0692bd6c5
...
Change-Id: Ie69c2346ab1b0eb44000f1cedef1bf8b386fd4f5
2020-03-23 11:30:12 +00:00
TreeHugger Robot
c2cd9cc5cd
Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c
am: 4a4190dc9d
...
Change-Id: I43e8ad3674ea7207eca3b3af254db5aead8005f6
2020-03-23 11:22:11 +00:00
Raff Tsai
cf990c239e
Merge "Modify close app function." am: ce1f51128b
am: 579878afcf
am: ffe91b44f8
...
Change-Id: I2b1dea5dc42fd7cf866933500935cf7e209321d4
2020-03-23 11:21:59 +00:00
TreeHugger Robot
4a4190dc9d
Merge "Show in UI if admin has disabled face auth" into rvc-dev am: 6f4a9bf11c
...
Change-Id: I8fb8f2eed514670d900c4dad4f46953ae8265249
2020-03-23 11:16:50 +00:00