PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,774 Commits 1 Branch 0 Tags
0b32437916d33610fce0bd738a2db774dc17059c
Commit Graph

62774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
3ffc55f1ce Merge "[Settings] Replacing SubscriptionManager#addOnSubscriptionsChangedListener API" into rvc-dev am: 9a0f633600 am: d2f98e4dad 
Change-Id: Ibf4c8ae584bcd77145df0837a0301e811b95cfe4
 2020-03-24 07:38:03 +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
TreeHugger Robot
4048901bc8 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: 0e2eab994d am: 4a0e23b6b0 am: ba7863dc17 
Change-Id: Idfe1b7af6637c5431df14468e0ce14a751ab0d6e
 2020-03-24 06:53:56 +00:00
Automerger Merge Worker
f5f0a40c88 Merge "Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: 437b0b66d4" into rvc-d1-dev-plus-aosp am: 45f1e0230a am: c18184aee9 
Change-Id: Id4644f0462eaf65f77dd663215e3eaf2b0b80b5c
 2020-03-24 06:53:15 +00:00
TreeHugger Robot
ba7863dc17 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: 0e2eab994d am: 4a0e23b6b0 
Change-Id: I26151b4fab716a3ebea89c23762cfae17c8e9cc3
 2020-03-24 06:52:51 +00:00
TreeHugger Robot
55fa8229a7 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: f5eac3f0cf am: 95d85c0e34 
Change-Id: I7335593a093a8e25c0296434e710f7ccd667d140
 2020-03-24 06:52:32 +00:00
Automerger Merge Worker
c18184aee9 Merge "Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: 437b0b66d4" into rvc-d1-dev-plus-aosp am: 45f1e0230a 
Change-Id: Ifc5a7688f035ef1f86184bc07653162bdbfca1c2
 2020-03-24 06:39:36 +00:00
TreeHugger Robot
4a0e23b6b0 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: 0e2eab994d 
Change-Id: I731f652a3512f951b9553d2b35484ca71e55e624
 2020-03-24 06:39:09 +00:00
TreeHugger Robot
95d85c0e34 Merge "Update DND people Settings pages" into rvc-dev am: a33c8e8048 am: c21f849fe7 am: f5eac3f0cf 
Change-Id: I7db30868c2560775df97b9c8e4850e58b31ab669
 2020-03-24 06:39:06 +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
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
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