PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,508 Commits 1 Branch 0 Tags
e5433adfb9d64a92b89e46adc1cd1efa67cba5cc
Commit Graph

90508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
c8cc41b226 Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev am: f4a80fdfa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15120295

Change-Id: I760cbb29865295678a5033e58c9412d1ab9af51c
 2021-06-28 05:42:20 +00:00
Bonian Chen
40a93c2511 Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev am: f4a80fdfa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15120295

Change-Id: I01d1c9a907097c944f68829bc0ff9d68eebd1435
 2021-06-28 05:42:19 +00:00
Bonian Chen
f4a80fdfa3 Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev 
* changes:
  Revert "[Settings] Fix build breakage"
  Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..."
 2021-06-28 05:28:07 +00:00
Bonian Chen
4c4d8e3a08 Revert "[Settings] Fix build breakage" 
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ifb1a579863df157b41aebbdf59ad7e4584efa866
 2021-06-28 05:23:33 +00:00
Bonian Chen
69fc8e0ccd Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..." 
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ib830b7b00504264a703a03a00bfdfcf65135d394
 2021-06-28 05:23:33 +00:00
TreeHugger Robot
bda4ea1713 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: b664b7f0c0 am: 7fdf264b88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: Ibec2bf33079b4ea200b0201064759e0a84103a0a
 2021-06-28 05:00:07 +00:00
TreeHugger Robot
458864c935 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: 3110021f51 am: f855901e7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: I625ad4ff716b93395a2cbd1feb0e2fa5fc7d8942
 2021-06-28 04:59:37 +00:00
TreeHugger Robot
7fdf264b88 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: b664b7f0c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: Ia7fdf69b570e6a3d94ae2485a073cb557474f6a1
 2021-06-28 04:51:56 +00:00
TreeHugger Robot
f855901e7d Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: 3110021f51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: I70216fb6ce75fdbab7b770a160d88098bd083271
 2021-06-28 04:48:32 +00:00
TreeHugger Robot
d1586a2619 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f am: 6fbeadac34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: Iec6c485a15e053678d96b41c35ff8094289fc936
 2021-06-28 04:47:38 +00:00
TreeHugger Robot
b664b7f0c0 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: I9f35f48be860d3513e64d724a98f6e01d7282331
 2021-06-28 04:39:32 +00:00
TreeHugger Robot
6fbeadac34 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: I78d5afe93092c4ca5f874177e56ad1cc73620384
 2021-06-28 04:38:44 +00:00
TreeHugger Robot
3110021f51 Merge "Consistent color between status bar and app bar" into sc-dev am: 3d5fd19e9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076803

Change-Id: I14c08d87c5895a6962142a226d52f3ed6fbf7b84
 2021-06-28 04:37:57 +00:00
Bonian Chen
ddda72d975 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: aaea164675 am: 892bd63eba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: Ifd3b4a81d965e5164e5ec0859a5e02fbac0f157a
 2021-06-28 04:27:13 +00:00
Bonian Chen
c431701061 [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: b45ea80636 -s ours am: fcb5e44513 -s ours 
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785

Change-Id: I29701c06e6ca2df838f06f518ca04ec756fa7f00
 2021-06-28 04:27:12 +00:00
Arc Wang
55f564c6e4 Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: 659eb02d2d am: e989bd2b39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: I6c65d3b7e807a010a7f13ae00d20a13222e99edc
 2021-06-28 04:27:04 +00:00
Bonian Chen
60b6ba0400 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: 80d7c162d6 am: e0667d76d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: If073eb817eca100018d14900d8d1d44932649321
 2021-06-28 04:26:58 +00:00
Bonian Chen
4f4022fb06 [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: 8e80d83db5 -s ours am: bf0827680b -s ours 
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785

Change-Id: I7d85bac78922b30af4f8b08190cd0149f841716d
 2021-06-28 04:26:56 +00:00
Arc Wang
d939150c4f Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: 14920afb08 am: cc4745e44c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: I43c7a70f6d1d39994c0448b59977cf4e8baa9c15
 2021-06-28 04:26:36 +00:00
TreeHugger Robot
3d5fd19e9f Merge "Consistent color between status bar and app bar" into sc-dev 2021-06-28 04:25:09 +00:00
Bonian Chen
63405687b7 Merge "[Settings] fix for Wifi calling settings page crash" 2021-06-28 04:20:26 +00:00
Jeremy Goldman
3444ee6e0b Merge "LegacyVpnPreferenceTest added for Vpn settings" 2021-06-28 04:13:38 +00:00
Bonian Chen
892bd63eba Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: aaea164675 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: Iada0ebadf897e11d8f8cc9b79d8e3c33df3e4020
 2021-06-28 04:13:31 +00:00
Bonian Chen
fcb5e44513 [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: b45ea80636 -s ours 
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785

Change-Id: Ife5270eb204de173fe31b81a2c78685993c1d169
 2021-06-28 04:13:30 +00:00
Arc Wang
e989bd2b39 Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: 659eb02d2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: I03f77f855a49eb02a5e594d10b100616ee230690
 2021-06-28 04:13:24 +00:00
Bonian Chen
e0667d76d6 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: 80d7c162d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: I41b520c31b5ffaef539f3873f4b2863cbf907960
 2021-06-28 04:13:08 +00:00
Bonian Chen
bf0827680b [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: 8e80d83db5 -s ours 
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785

Change-Id: I046dea0a350b64b41b2798d28f81af85674ff41d
 2021-06-28 04:13:07 +00:00
Arc Wang
cc4745e44c Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: 14920afb08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: I927766434199149ea622f98ecb5471ef7dc943a8
 2021-06-28 04:13:02 +00:00
Bonian Chen
66c2eb2cb3 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b am: f6e9f00332 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: Ic4f637888de5994653909e543b6796818960ec3c
 2021-06-28 04:12:46 +00:00
Bonian Chen
e93c4ce6c4 [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours am: f03086e9db -s ours 
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785

Change-Id: I7deb279ce0341ec67af0c104dc5be4177b4d2ebc
 2021-06-28 04:12:45 +00:00
Arc Wang
97c231244f Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa am: d7a57a59d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: Ib871f554cc325dbbfa87a6005bd28cbc0dac0187
 2021-06-28 04:12:38 +00:00
Bonian Chen
80d7c162d6 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: I527a0776f2d90cd46e79d1a6166c9299d0455d15
 2021-06-28 04:03:59 +00:00
Bonian Chen
8e80d83db5 [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours 
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785

Change-Id: I082fadec71144aa9704292de422a4a8f2deb55ab
 2021-06-28 04:03:58 +00:00
Bonian Chen
f6e9f00332 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: I6888257ca0fb942c1e388448cb71466000bdabe3
 2021-06-28 04:03:14 +00:00
Bonian Chen
f03086e9db [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours 
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785

Change-Id: Iea5aafb8e04dfbed3c9d3d132508161c31bbecc1
 2021-06-28 04:03:12 +00:00
Bonian Chen
aaea164675 Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev am: c437177d4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15106410

Change-Id: I43500208af3d17787ad7065cfe05735486ef2cce
 2021-06-28 04:02:18 +00:00
Bonian Chen
b45ea80636 [automerger skipped] Merge "[Settings] Fix build breakage" into sc-dev am: bf4120f3f8 -s ours 
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 2a1344a50e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785

Change-Id: I3d56a66613cb0b2a6b187f9be672d9b03f5385a1
 2021-06-28 04:02:17 +00:00
Bonian Chen
c437177d4b Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev 2021-06-28 03:59:43 +00:00
Bonian Chen
bf4120f3f8 Merge "[Settings] Fix build breakage" into sc-dev 2021-06-28 03:59:43 +00:00
Arc Wang
14920afb08 Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: Iac6365f7e239d3d5472807e82de49526e48aeb52
 2021-06-28 03:57:57 +00:00
TreeHugger Robot
eef2932bc9 Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 46398c4a58 am: e7679a06b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I26e2d2cbb83e34a70594ae0a74e913f0d52a73c4
 2021-06-28 03:57:43 +00:00
TreeHugger Robot
47a300c60d Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 3e8addbb80 am: 3700019007 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: Ide18b69822f71f39f315e4c85e9f892db3c5ee74
 2021-06-28 03:57:25 +00:00
Arc Wang
d7a57a59d6 Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: I6ce40af99f6494a915040e662c86ad0e93444110
 2021-06-28 03:57:13 +00:00
Arc Wang
659eb02d2d Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev am: 3625cf50aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102781

Change-Id: Iadf3b86d87e11e481f5ea7161c5e8c3ab6b0f2bb
 2021-06-28 03:56:15 +00:00
Arc Wang
3625cf50aa Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev 2021-06-28 03:43:59 +00:00
TreeHugger Robot
e7679a06b6 Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 46398c4a58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I7ed5146fa41fa50b2e64ac82b9c8276d3b0d3262
 2021-06-28 03:43:30 +00:00
TreeHugger Robot
3700019007 Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 3e8addbb80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I99bbdd63385d92133b5feda79de2a3f3db29f724
 2021-06-28 03:42:57 +00:00
TreeHugger Robot
71723830f8 Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 am: 194c2a8c0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I0fd2c832c363fbfc012c80e9f29bca0345f96a83
 2021-06-28 03:42:33 +00:00
TreeHugger Robot
3e8addbb80 Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I8d0dcebbcbc2d7bf4d2e221ffb7eacc96f95df0d
 2021-06-28 03:25:07 +00:00
TreeHugger Robot
194c2a8c0a Merge "Fix switch behavior with switch access" into sc-dev am: 0bea498ae1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15112042

Change-Id: I77608d1b291e07ed8034450b89bb08bf2328d4be
 2021-06-28 03:24:15 +00:00