Commit Graph

62963 Commits

Author SHA1 Message Date
TreeHugger Robot
0e2eab994d Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7
Change-Id: I8b7b73e65f18c955bd82f38390ec88b5520e62ab
2020-03-24 06:31:23 +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
TreeHugger Robot
131604e5a7 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 45df17b1cb am: 4db41f15c7 am: 1a5358eeaa
Change-Id: I9c7e241b96c61b0da756071646ad41f5eb8028b1
2020-03-24 00:56:05 +00:00
TreeHugger Robot
eabfee3a39 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 8490a15ad9 am: d50c2c9641 am: 3119536de2
Change-Id: I41b8ef5e327bb84efd83c38476b11687dfd02c95
2020-03-24 00:08:41 +00:00
TreeHugger Robot
ad20ab50e5 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 008ce5e6e0 am: c9a3bbea99
Change-Id: I723b4b699fa32dc2c06e873b6fce91fecafa256f
2020-03-23 22:57:28 +00:00
TreeHugger Robot
1a5358eeaa Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 45df17b1cb am: 4db41f15c7
Change-Id: I2522ddc2d0e6c6a3608617b4940c51b3553498e3
2020-03-23 19:39:23 +00:00
TreeHugger Robot
3119536de2 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 8490a15ad9 am: d50c2c9641
Change-Id: Iab1929a3aa22a1fda96e2b32e06aa711535e56ec
2020-03-23 19:29:51 +00:00
TreeHugger Robot
c9a3bbea99 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 008ce5e6e0
Change-Id: Idf92fe474895f4db749648f8b4735ab7e4256651
2020-03-23 19:23:16 +00:00
TreeHugger Robot
4db41f15c7 Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768 am: 45df17b1cb
Change-Id: Ib6a27db8af3990b3185c97d30bc336bd99f688cf
2020-03-23 19:04:10 +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
45df17b1cb Merge "Add strings for power menu settings" into rvc-dev am: a3fccb9cc0 am: 3052c27768
Change-Id: I408626ea9cc63dcd54c9d2c656148d0a4e101f82
2020-03-23 18:50:07 +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
7575eb44d5 Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 7866eddfa5 am: c1b5526cc5 am: ddabc9111b am: 84bab384d9
Change-Id: I6f0ffa1e5425cc70ee4be30f9e75e3f8ea0d3ac7
2020-03-23 17:47:26 +00:00
TreeHugger Robot
2a5613b1eb Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 38fab2476f am: 526ddd391f am: dfa0910431
Change-Id: I30607606781c4fb436926380f3073cff899d09da
2020-03-23 17:46:33 +00:00
TreeHugger Robot
9b9b83f3cd Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 7866eddfa5 am: fea8da24ee am: bc35ad85b8
Change-Id: I141a416ad6c63161c8049193def2c2385a66d2bb
2020-03-23 17:45:45 +00:00
TreeHugger Robot
84bab384d9 Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 7866eddfa5 am: c1b5526cc5 am: ddabc9111b
Change-Id: Id62f5ca3bfa50452c1e427ebcda42a6871893634
2020-03-23 17:37:22 +00:00
TreeHugger Robot
dfa0910431 Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 38fab2476f am: 526ddd391f
Change-Id: Ic777845f3fc96e150e8f63602269c8b17083b792
2020-03-23 17:29:58 +00:00
TreeHugger Robot
bc35ad85b8 Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 7866eddfa5 am: fea8da24ee
Change-Id: I912c989951dfd0556c3b288bbf28242181ce3c77
2020-03-23 17:26:26 +00:00
TreeHugger Robot
ddabc9111b Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 7866eddfa5 am: c1b5526cc5
Change-Id: I4305b2954a0b1c790373dfc1fc19b25ea8f6ddaf
2020-03-23 17:18:50 +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
c1b5526cc5 Merge "Redesign individual conversation page" into rvc-dev am: 43d9013aaa am: 7866eddfa5
Change-Id: Ia203a689b3411b20bc30e80562389755bdbc4bdd
2020-03-23 17:05:08 +00:00
Mady Mellor
0daa9b7aa3 Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 am: 2c59efa1b9 am: 415f8b549f am: bc0a31a331
Change-Id: I2b2fc15413074484a854aafabb23aa3a959a5dfa
2020-03-23 16:55:52 +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
Mady Mellor
bc0a31a331 Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 am: 2c59efa1b9 am: 415f8b549f
Change-Id: I7c4706b55090fb545961264fe35d5c86e4fc1f2e
2020-03-23 16:45:57 +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
Mady Mellor
78865ad381 Merge "String updates" into rvc-dev am: 159538d35a am: e929e69810 am: 18d11571a9 am: 296025b6db
Change-Id: If1e9bae914ee4e18098a9bbd8157f1532598b51f
2020-03-23 16:45:30 +00:00
Mady Mellor
25c3c680a5 Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 am: e07e3b53c8 am: a1c1b3095c
Change-Id: Ie32b888ad8c971170583febf4cd46158dd4b8087
2020-03-23 16:45:17 +00:00
TreeHugger Robot
43d9013aaa Merge "Redesign individual conversation page" into rvc-dev 2020-03-23 16:31:27 +00:00
Mady Mellor
296025b6db Merge "String updates" into rvc-dev am: 159538d35a am: e929e69810 am: 18d11571a9
Change-Id: If2f523a48628ec78e40336b285e3c94bdf6d8638
2020-03-23 16:30:25 +00:00
Mady Mellor
415f8b549f Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 am: 2c59efa1b9
Change-Id: I74591ad7a1d0ee9a0feec994c4033055dcfebe98
2020-03-23 16:30:18 +00:00
Mady Mellor
a1c1b3095c Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480 am: e07e3b53c8
Change-Id: I59db11d7a282b516c2169970f60f412dced87104
2020-03-23 16:30:18 +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
2c59efa1b9 Merge "String updates" into rvc-dev am: 159538d35a am: 9559e7d480
Change-Id: I1c71776e55bbc485f075431ff45b5a57fbafd923
2020-03-23 16:23:13 +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
46dc92772c [automerger skipped] Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: fae0dc47f8 am: ac27493f40 am: b77dc4a6a0 -s ours am: 0d9931b186 -s ours
am skip reason: Change-Id I9c23c558a9d764702e966d22e5c6e5c5425e4d32 with SHA-1 509273cc03 is in history

Change-Id: Iafac66a113888f344b17ae9fd4dbad7b8d48e981
2020-03-23 15:31:56 +00:00
TreeHugger Robot
0d9931b186 [automerger skipped] Merge "Updates main page for Do Not Disturb" into rvc-dev am: 4d4c55ad72 am: fae0dc47f8 am: ac27493f40 am: b77dc4a6a0 -s ours
am skip reason: Change-Id I9c23c558a9d764702e966d22e5c6e5c5425e4d32 with SHA-1 509273cc03 is in history

Change-Id: Ifb943c234b57648cf82fea022d073aa8446e4047
2020-03-23 15:22:40 +00:00