PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,014 Commits 1 Branch 0 Tags
17ec2206f36cb428c041330fb99a5a20bf49da7b
Commit Graph

61014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Murdoch
55ee7603e5 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 7b2154d996 
Change-Id: I199ea1ad09f5aaef63ffc9312d058a5c452e53d5
 2020-03-24 10:57:28 +00:00
Ben Murdoch
cdcf827947 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 am: 63aded6f67 
Change-Id: I6fec6b405557e9ad69ff875e890591be9a6d8d02
 2020-03-24 10:57:24 +00:00
Ben Murdoch
7b2154d996 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 
Change-Id: I4a67e3a9d94d63f0cc9cb6942acabd1e9c32b936
 2020-03-24 10:45:49 +00:00
Ben Murdoch
63aded6f67 Merge "Move strings related to user creation to SettingsLib." into rvc-dev am: 7afced3599 
Change-Id: I822c63ede7d0f92dbfe724731350fc140db88ef5
 2020-03-24 10:45:25 +00:00
Ben Murdoch
7afced3599 Merge "Move strings related to user creation to SettingsLib." into rvc-dev 2020-03-24 10:25:21 +00:00
Zoey Chen
03e57ffd43 [automerger skipped] Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: c1f1682fbf -s ours 
am skip reason: Change-Id I6b363bd609d580d547cb59851f5bfaba57ef7154 with SHA-1 2b8bde162f is in history

Change-Id: I5b266f4a55981afc9f1ebf2da326e6edcea4a783
 2020-03-24 09:33:33 +00:00
Zoey Chen
c79289a585 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 am: 2a0dd6f700 
Change-Id: I26dda4b26362bb94c48e1ad439af536d0353df16
 2020-03-24 09:33:08 +00:00
SongFerngWang
a043c5a7ad Fix the NetworkScanHelperTest testcase. 
To fix the NetworkScanHelperTest testcase, becasue mainline cause
the testcase fail.

Bug: 147464840
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkScanHelperTest
Change-Id: I2992606dd082d2b87e047beacd9cf1c26790f450
 2020-03-24 17:16:51 +08:00
Zoey Chen
c1f1682fbf Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 
Change-Id: I2cf40657d94d445a3582f7b64f6e02dbf8e77aa2
 2020-03-24 09:16:42 +00:00
Zoey Chen
2a0dd6f700 Merge "Merge "Fixed NullPointerException" am: 5fb16be925 am: cbe5bbdcd5 am: 456b2bf87b am: b301288cd7 am: 036496e2d0" into rvc-dev am: 61b66a28d9 
Change-Id: I75a262c21d215f8669c81056b581c5ffd734accb
 2020-03-24 09:16:28 +00:00
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
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