PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,337 Commits 1 Branch 0 Tags
25a6752ac7f029187d1349b759766f6dd245715c
Commit Graph

93337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Curtis Belmonte
e2cecc12ce Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151

Change-Id: Ide0d2b21c96a12f0a597ece182d5bf4631df4286
 2021-08-10 00:17:34 +00:00
Curtis Belmonte
4cb6d12b55 Merge "Make face education handle timeout result correctly" into sc-dev 2021-08-10 00:06:17 +00:00
Fan Zhang
2a3920e44d Use NEW_TASK|CLEAR_TOP when launching emergency app 
This flag combination will attempt to go to the existing emergency app
task stack instead of creating duplicate ones.

Fix: 193108390
Test: manual
Change-Id: Ia9c9ead4e8b1d27582cdaff3e4d42c762e80709a
 2021-08-09 22:54:21 +00:00
Curtis Belmonte
ea07bb8d2f Make face education handle timeout result correctly 
Ensures that a result code of RESULT_TIMEOUT always causes the face
enroll education screen to finish and propagate the result.

Test: Lock and unlock screen at each stage of face enrollment

Fixes: 194857793
Change-Id: Ie4b09235f923c8a40de18878b0727f166112140f
 2021-08-09 14:12:45 -07:00
TreeHugger Robot
0ef977bc91 Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: b4d5a623bd am: f05653b4cb am: 3fe7536a82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: Ia3e5a8075d5b34b6763abad115941694e79800fd
 2021-08-09 21:00:18 +00:00
TreeHugger Robot
4b9862ef47 Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: b4d5a623bd am: 534802b35f am: 9f9829c29d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: I66f0c1b82ef41db9e701ca4e636b03999a6f3194
 2021-08-09 21:00:05 +00:00
TreeHugger Robot
623df58e6f Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: a03d9cee0b am: 918adcbfcc am: 257e4211b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: I372233ad6f9a89e2d15578b3631797178a23fa40
 2021-08-09 20:59:52 +00:00
TreeHugger Robot
3fe7536a82 Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: b4d5a623bd am: f05653b4cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: Ic034217cc96493242a06487caaeff4fcdb618e1a
 2021-08-09 20:52:05 +00:00
TreeHugger Robot
9f9829c29d Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: b4d5a623bd am: 534802b35f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: I03cb6c3d06705d61e4d7d488080d74405705472b
 2021-08-09 20:48:31 +00:00
TreeHugger Robot
257e4211b1 Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: a03d9cee0b am: 918adcbfcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: If8141f0cb5193d5884fb7dd8fe226e3085ba62d1
 2021-08-09 20:48:20 +00:00
TreeHugger Robot
f05653b4cb Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: b4d5a623bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: I3e97e4135581767de7c83375421ed002afc4b9c0
 2021-08-09 20:35:13 +00:00
TreeHugger Robot
534802b35f Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: b4d5a623bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: Iba0f93b0b4e45ad219513adf545835f63f9f299a
 2021-08-09 20:35:12 +00:00
TreeHugger Robot
918adcbfcc Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: a03d9cee0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: Ife772033e7d015738ee67a17e2688d6f3977ee69
 2021-08-09 20:34:56 +00:00
TreeHugger Robot
de847df6a4 Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: 329043e7fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: Idc223d9329af52965d28464dbb47cb85e3967f7c
 2021-08-09 20:34:43 +00:00
TreeHugger Robot
b4d5a623bd Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: I3d67364a06f6486e8aab5c7e86100f8aaab85665
 2021-08-09 20:20:18 +00:00
TreeHugger Robot
329043e7fe Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: I2fa4665580ea163a8113025fb7aeb4619c30806f
 2021-08-09 20:19:45 +00:00
TreeHugger Robot
a03d9cee0b Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: I016bb3be3c99196c609a41903f3782cc9a73c458
 2021-08-09 20:19:21 +00:00
TreeHugger Robot
9000bdc25f Merge "The wifi dialog text should be Google Sans Text" into sc-dev 2021-08-09 19:59:07 +00:00
Joshua
5ebb245618 Create Dialog to edit TARE factors 
This CL is the base framework for creating and adjusting TARE factor
values. TareFactorDialogFragment sets the basic outline for a factor
that uses a DialogBox to adjust the value. It takes the "title" or name
of the factor, the key that will be associated with the factor, and an
initial value for the factor; then sets up everything so that the factor
value can be easily changed and stored. These factors are also
registered into the settings observer class.

Bug: 195055619
Bug: 193238774

Test: Manual (Made a temporary class instance of the DialogFragment and
showed it in inactive apps onResume())

Change-Id: I3bb67717175e70eab3bbb11f4a42ee63a42f60bc
 2021-08-09 19:45:25 +00:00
TreeHugger Robot
817874bf79 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 869e01eecb -s ours am: 26710ec44c -s ours am: 0f157dcc29 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I270a247324b718cd5a516073c343ce1c55a7fddd
 2021-08-09 14:24:58 +00:00
TreeHugger Robot
0f157dcc29 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 869e01eecb -s ours am: 26710ec44c -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I5b4a29f8eb04364ad1c2a75279ce013869c4766e
 2021-08-09 14:15:25 +00:00
TreeHugger Robot
480f5646d6 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 869e01eecb -s ours am: ef72e3b1de -s ours am: 71bdf0ce4c -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I658ba55abf0ffff0b730b4393bbb627a569f0e92
 2021-08-09 14:11:12 +00:00
TreeHugger Robot
71bdf0ce4c [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 869e01eecb -s ours am: ef72e3b1de -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Icf3a7c8ef5a4031233f727ea69d8c3684eff4ac4
 2021-08-09 13:58:06 +00:00
TreeHugger Robot
9b91fc8daf [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 421e0c398c -s ours am: b84efe7136 -s ours am: 6915e70c07 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I3db72d3caec60500f332c41633fe35991b7310fa
 2021-08-09 13:54:12 +00:00
TreeHugger Robot
c699b930b6 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 9246df546a -s ours am: 169dc0e55f -s ours am: d3e3e72923 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I75f07101cb3145ed9e0076fd23b38cf40bf3a484
 2021-08-09 13:54:06 +00:00
TreeHugger Robot
ef72e3b1de [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 869e01eecb -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I8124f786900616b262ba7289c7f4524b4adcb7cb
 2021-08-09 13:44:55 +00:00
TreeHugger Robot
26710ec44c [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 869e01eecb -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Ib4416d8e7742c40db2be708bf0eb655ad8e9f5ea
 2021-08-09 13:44:55 +00:00
TreeHugger Robot
6915e70c07 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 421e0c398c -s ours am: b84efe7136 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I00e0fe40bc913cf49d9d8df5f0a36757460a3d57
 2021-08-09 13:35:02 +00:00
TreeHugger Robot
d3e3e72923 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 9246df546a -s ours am: 169dc0e55f -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Ie77db13e46300d72e630c8b9f7b8773f519653d1
 2021-08-09 13:34:58 +00:00
TreeHugger Robot
b84efe7136 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 421e0c398c -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I3cd040d10545ba96aaec0f9237b922a2bfc66d5f
 2021-08-09 13:34:29 +00:00
TreeHugger Robot
64153dc805 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: f44c291ec6 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Ie065a9a3a172b0ebe2a27c7156e9a7b1c964e69e
 2021-08-09 13:34:05 +00:00
TreeHugger Robot
869e01eecb [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Ia3cf15d66f84dc53d92efab02577ec44a755416c
 2021-08-09 13:25:40 +00:00
TreeHugger Robot
4db2e38f46 Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: f346e833e9 am: 84b515396f am: 956008279d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: I4681cb05657a73b62b7343c8a33975f63cb2de3a
 2021-08-09 13:25:22 +00:00
TreeHugger Robot
f709018e59 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 2d742d01f7 -s ours am: 7fccf00f5d -s ours am: 72366e30f4 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I43c0db0ee2b4c9af892691db836c69ca5c7a1f2a
 2021-08-09 13:25:15 +00:00
TreeHugger Robot
12d7c86720 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 9246df546a -s ours am: b948c4195e -s ours am: 89a9de3cbd -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I4c6b1ab48057f96ceb0e71e0d08f79b0acf86785
 2021-08-09 13:25:09 +00:00
TreeHugger Robot
c662bbacfc Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: f346e833e9 am: e7a555d9f6 am: 8be87a7d0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: Ic3f221d15c98832c63bcd1da726c6e723a23cbf7
 2021-08-09 13:25:03 +00:00
TreeHugger Robot
e9827b266d Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: 329b5f412e am: f7dbcb8306 am: bb2a402ed6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: Ia980e15520736c1ac98a0dc5a0f37c0ad0bf2849
 2021-08-09 13:24:56 +00:00
TreeHugger Robot
f44c291ec6 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Ia0ccc4d5b641298223320c69587f7437c8b99860
 2021-08-09 13:24:55 +00:00
TreeHugger Robot
956008279d Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: f346e833e9 am: 84b515396f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: I555655ec265b359287093ff840edcfecfe67a5a8
 2021-08-09 13:24:53 +00:00
TreeHugger Robot
421e0c398c [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I435e93045b3dd0e1512f18ac2a0e7590bb16ac3e
 2021-08-09 13:24:51 +00:00
TreeHugger Robot
72366e30f4 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 2d742d01f7 -s ours am: 7fccf00f5d -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I91cc1d0a1e0903f6aaa7dfb5f117b6f38f059a7e
 2021-08-09 13:20:59 +00:00
TreeHugger Robot
89a9de3cbd [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 9246df546a -s ours am: b948c4195e -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I13dccf14127e88ce05738f64cf08e43bbd25b65f
 2021-08-09 13:10:38 +00:00
TreeHugger Robot
8be87a7d0f Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: f346e833e9 am: e7a555d9f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: If17621edde39019e898675773a966af733d1385d
 2021-08-09 13:10:34 +00:00
TreeHugger Robot
bb2a402ed6 Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: 329b5f412e am: f7dbcb8306 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: I57ceea07b452b77717ad6d17dd82b2fe6e2de00f
 2021-08-09 13:10:06 +00:00
TreeHugger Robot
88b0676d08 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Id2f1a85f30eb2b95459b22426dcab5abb696aed4
 2021-08-09 13:06:56 +00:00
TreeHugger Robot
169dc0e55f [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 9246df546a -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Ia95c3b00e0fab7e1eeafcc2763cf6e40c5579045
 2021-08-09 13:02:02 +00:00
TreeHugger Robot
b948c4195e [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 9246df546a -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I4e393b085baa7b2a2d9cc3da48496a636d3584e9
 2021-08-09 13:01:59 +00:00
TreeHugger Robot
84b515396f Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: f346e833e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: I68e2b5db88b44c77e8da4182a8f7f567a2c93e9c
 2021-08-09 13:01:57 +00:00
TreeHugger Robot
e7a555d9f6 Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: f346e833e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: I3e36ec40c8d95beb5b3e11892171683a0e9bf0e1
 2021-08-09 13:01:56 +00:00
TreeHugger Robot
7fccf00f5d [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 2d742d01f7 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Ied56a68ff15e8b2721f56ff996cc1f5799267bd4
 2021-08-09 13:01:44 +00:00