PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,697 Commits 1 Branch 0 Tags
8b1499a7eed615508f99e8abc43c15266aaf1f01
Commit Graph

69697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
8b1499a7ee Merge "Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 am: b29c7c49e7" into rvc-qpr-dev-plus-aosp am: 22bcdc79cd 
Change-Id: I22ca4a035573fcf28133ae9693ce771e1b1f277c
 2020-05-21 13:01:42 +00:00
TreeHugger Robot
48f895f0a0 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9a9490e6b9 am: 9316cd31e7 
Change-Id: I68930d17a0f7501598db7375dea7ae03d857e16c
 2020-05-21 13:01:33 +00:00
TreeHugger Robot
fe4d120cc8 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9e5d3a8805 am: 37f19e547d 
Change-Id: I3f100b7a0c786525bf02ee30dcdbc4ee98cf3917
 2020-05-21 13:01:23 +00:00
Automerger Merge Worker
22bcdc79cd Merge "Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 am: b29c7c49e7" into rvc-qpr-dev-plus-aosp 2020-05-21 12:46:42 +00:00
TreeHugger Robot
640f3cec66 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 am: b29c7c49e7 
Change-Id: I31e51425df7c1156b1a5266d665f0d60ce82e5c2
 2020-05-21 12:46:37 +00:00
TreeHugger Robot
9316cd31e7 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9a9490e6b9 
Change-Id: I97499ad374d60634f6d71f6bb76c76307718da4c
 2020-05-21 12:46:31 +00:00
TreeHugger Robot
37f19e547d Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9e5d3a8805 
Change-Id: I86a4c1678b1566135d0c1d3e8ef519598bc4e100
 2020-05-21 12:46:10 +00:00
TreeHugger Robot
b29c7c49e7 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 
Change-Id: I4ad18d5526b18a4eb862f77f379736fbd0e8a0e2
 2020-05-21 12:35:02 +00:00
TreeHugger Robot
9a9490e6b9 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 
Change-Id: Idae86bae7cf14e65d72a3e9ef4073bdbee1557df
 2020-05-21 12:34:59 +00:00
TreeHugger Robot
9e5d3a8805 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 
Change-Id: I05397c331eadd9841fd8c2ba935b75ad5861dbc8
 2020-05-21 12:34:32 +00:00
TreeHugger Robot
e65b99bce2 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 
Change-Id: I9a5a8969ec1998d0988ce1acc0ed68e3ec24d8a8
 2020-05-21 12:21:01 +00:00
TreeHugger Robot
1560e89128 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 
Change-Id: I97bc8f4fa39ca1fef9bbce21d1fb48832d948fba
 2020-05-21 12:20:57 +00:00
TreeHugger Robot
43d6bd38f5 Merge "Only show work profile notifs if enabled" into rvc-dev 2020-05-21 12:09:37 +00:00
TreeHugger Robot
bc92d48d3f Merge "Create new WifiEntryPreference if WifiEntry object changes" 2020-05-21 05:22:39 +00:00
Arc Wang
2547d0617c Create new WifiEntryPreference if WifiEntry object changes 
WifiSettings2 should create a new WifiEntryPreference for a cached
WifiEntry key in case the underlying object has changed, so that updates
to the WifiEntry are still being listened to. This may happen
in situations where WifiPickerTracker swaps WifiEntries objects with the same
key in the getWifiEntries() list, such as when handling network
suggestions (which are kept as separate objects from the non-suggestion
entries).

Bug: 157174114
Test: manual visual verification in wifi picker of adding a network
suggestion and seeing the entry summary for that SSID change to the
suggestion summary.

Change-Id: I48ac11364b06887cc4059bcda863b456e206c9bd
 2020-05-21 09:21:48 +08:00
Jeff Tinker
ab3ac85bc9 [automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours am: 01b3da1dbd am: 70aa2882a6 am: c8baa3edf7 
Change-Id: Ie61b885b1e63f1a0a8dc27991334e8bf0da823f7
 2020-05-20 20:59:42 +00:00
Jeff Tinker
c8baa3edf7 [automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours am: 01b3da1dbd am: 70aa2882a6 
Change-Id: Ic649d0d9dc9884139343a6017d600e3e1065c91f
 2020-05-20 20:46:54 +00:00
Jeff Tinker
70aa2882a6 [automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours am: 01b3da1dbd 
Change-Id: I0a367b53e4c85ea3db4b8452073c64d836aa721e
 2020-05-20 20:33:02 +00:00
Jeff Tinker
01b3da1dbd [automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours 
am skip reason: skipped by user jtinker

Change-Id: I41cccce692c4cd294c74054cb072e0ada6f41941
 2020-05-20 20:14:25 +00:00
Jeff Tinker
a5f7479f5a Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c 
Change-Id: I980e0dba1556a28d683ffb3e5a40da52974c062e
 2020-05-20 19:50:57 +00:00
Jeff Tinker
9e974afd4c Merge "Revert "[Settings] Remove mobile network v1"" 2020-05-20 19:37:56 +00:00
Jeff Tinker
9c657c34f4 Revert "[Settings] Remove mobile network v1" 
This reverts commit daf6c9e85b.

Reason for revert: Broken build 6513883 on aosp-master on errorprone

Change-Id: I5e473863c2669a3c89014e12cc952c5c72a12cb7
bug:157138919
 2020-05-20 19:14:57 +00:00
TreeHugger Robot
632c1870c1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: 8ebbe4db5c -s ours am: d384741938 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie58e881015910e75f2e3a5d1f2fbd6eac7c8df9a
 2020-05-20 16:50:06 +00:00
TreeHugger Robot
5898ac0e40 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: ac648d6916 -s ours am: 5446562899 -s ours 
am skip reason: subject contains skip directive

Change-Id: I4c45fea8c66a52be4069cec7d34eeb7a84fb33fc
 2020-05-20 16:49:19 +00:00
TreeHugger Robot
d384741938 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: 8ebbe4db5c -s ours 
am skip reason: subject contains skip directive

Change-Id: I726fa5c772a31d7b45b93554d0499b819629e686
 2020-05-20 16:35:01 +00:00
TreeHugger Robot
5446562899 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: ac648d6916 -s ours 
am skip reason: subject contains skip directive

Change-Id: I313496899c2833bb4238d6c2c024c0bce89b067b
 2020-05-20 16:34:22 +00:00
Julia Reynolds
39ceee9e00 Only show work profile notifs if enabled 
Test: manual, turn off profile
Fixes: 157137055
Change-Id: Ic042300297c09d132e793d13fec18b23d24f2cc8
 2020-05-20 12:29:39 -04:00
TreeHugger Robot
ac648d6916 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours 
am skip reason: subject contains skip directive

Change-Id: I1a6119bcc82c95a996d762eb9a28e6a2878f1ca1
 2020-05-20 16:22:06 +00:00
TreeHugger Robot
8ebbe4db5c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours 
am skip reason: subject contains skip directive

Change-Id: If1a628dce575776369bb61847735e7a6951fbe6e
 2020-05-20 16:22:02 +00:00
TreeHugger Robot
42a6154347 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-20 16:00:46 +00:00
TreeHugger Robot
9ac0f1b9bf Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: ba98f11c56 am: f6d7ce24b0 
Change-Id: I643251947f1966c323786a8af5417e3c0119d80f
 2020-05-20 15:23:53 +00:00
Automerger Merge Worker
026fe497b5 Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp am: a06ef7b194 am: f2e45400fc 
Change-Id: Id1fce889d0e4143f73c5dedee6d5f01789839ce5
 2020-05-20 15:23:45 +00:00
TreeHugger Robot
9a3278579b Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: 742dd6f60c am: cf1486003e 
Change-Id: I9cdc2f4a9eb2a8bb04b023f0bd7e789327640d98
 2020-05-20 15:22:40 +00:00
TreeHugger Robot
f6d7ce24b0 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: ba98f11c56 
Change-Id: I05a82bbf4ef6f294ee887d2497dd62dad6ab8811
 2020-05-20 15:03:04 +00:00
Automerger Merge Worker
f2e45400fc Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp am: a06ef7b194 
Change-Id: I15801851140bacc91006a5f2f9791eebc2534e2c
 2020-05-20 15:02:58 +00:00
TreeHugger Robot
cf1486003e Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: 742dd6f60c 
Change-Id: Ia5e40b1a8df8f8d59881e0ec5d11e71178db6004
 2020-05-20 15:02:49 +00:00
Automerger Merge Worker
a06ef7b194 Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp 2020-05-20 14:42:44 +00:00
TreeHugger Robot
1518db1927 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674 
Change-Id: Ica90e78597092bc44aabd28c5357fbe17ecffafe
 2020-05-20 14:42:40 +00:00
TreeHugger Robot
ba98f11c56 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc 
Change-Id: Ia5cccbd846203fb0acbc6207d37091d1a3e908b3
 2020-05-20 14:42:33 +00:00
TreeHugger Robot
742dd6f60c Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc 
Change-Id: I764291b14b76fa7dd24644fe3ae739f324f4f5e9
 2020-05-20 14:42:31 +00:00
TreeHugger Robot
d06d373674 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda 
Change-Id: I1867ea8309ed5ec9e8bda40f68cd6e56c69b1755
 2020-05-20 14:32:11 +00:00
TreeHugger Robot
3ba40628fc Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda 
Change-Id: Ibc06bd838df06258f98e87fcb3a9da43c47be504
 2020-05-20 14:31:50 +00:00
TreeHugger Robot
946e3adeda Merge "Show subtext for previously connected devices on BT card" into rvc-dev 2020-05-20 14:10:31 +00:00
Bonian Chen
460a330411 [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours am: e7495a57dc -s ours am: 47b98dd082 -s ours 
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: Ia88e5bfb526738861cb72f12fb194d2ce116bfcf
 2020-05-20 13:54:38 +00:00
Bonian Chen
47b98dd082 [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours am: e7495a57dc -s ours 
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: I2a9c3eaea606c66cba71fd5e23230aa924ec2dd7
 2020-05-20 13:32:24 +00:00
Bonian Chen
e7495a57dc [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours 
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: I0694e2236c4f7ecfb38583f3bb736f416991e434
 2020-05-20 13:19:34 +00:00
Bonian Chen
3d46b0e5ec [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours 
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: Ide8eb53eff3252d31505cc975ea094d76c70bf31
 2020-05-20 13:03:03 +00:00
Bonian Chen
075a17c995 Merge "[Settings] Remove mobile network v1" am: 10799d12fd 
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
 2020-05-20 12:45:32 +00:00
Bonian Chen
10799d12fd Merge "[Settings] Remove mobile network v1" 2020-05-20 12:28:20 +00:00
TreeHugger Robot
1f339625a5 Merge "Import translations. DO NOT MERGE" 2020-05-20 12:05:37 +00:00