PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,810 Commits 1 Branch 0 Tags
cd7094b9a92b80e6d9d116b0862aed7ab660c20c
Commit Graph

86810 Commits

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

Change-Id: I6e7f9d3bbcc76d243713c10b87f4817ebf2118c4
 2021-08-10 00:31:51 +00:00
Curtis Belmonte
d03beb3b3b Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55 am: e2cecc12ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151

Change-Id: Ic957d973f38682ea89d05b47e57f0a79d673ff64
 2021-08-10 00:31:31 +00:00
Curtis Belmonte
5968c28caf 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: I9299449e882dd42a6e5a56d500430e3e3f962ad6
 2021-08-10 00:18:20 +00:00
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
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
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
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
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
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
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
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
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
TreeHugger Robot
f7dbcb8306 Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: 329b5f412e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: I2ed45236d6f87dc2114d3fdbf8f261b409150ed8
 2021-08-09 13:01:39 +00:00
TreeHugger Robot
2d742d01f7 [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 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: Ifeee94d7f09c3df199b975d6a909f33798d24eb6
 2021-08-09 12:56:13 +00:00
TreeHugger Robot
9246df546a [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 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: I9b5c5cc4f9cbf7df96aad8378f99442cf141d96e
 2021-08-09 12:52:43 +00:00
TreeHugger Robot
f346e833e9 Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: I05ce4cf13fca889c18a2442f891bec8cb1b05d6e
 2021-08-09 12:52:40 +00:00
TreeHugger Robot
c06aef8e7f [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -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: I4fc8d0c172bf1c708296ed418e7e1364455bce1a
 2021-08-09 12:51:56 +00:00
TreeHugger Robot
329b5f412e Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: Iab98e9f744d06532d382f71cd07d39a8f7f2cfe5
 2021-08-09 12:51:50 +00:00
TreeHugger Robot
4a3bbeee1a [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -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: I51036566e38a1909f07146ea93c6df89b37805df
 2021-08-09 12:44:21 +00:00
TreeHugger Robot
876d9ec0dc [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -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: I7922d372f0a6867af34b93bf852bdda93a6e4c7a
 2021-08-09 12:44:20 +00:00
TreeHugger Robot
82fee52083 Merge "Fix launch flags for channel panel" into sc-dev 2021-08-09 12:38:47 +00:00
TreeHugger Robot
9d509c0b31 Merge changes from topic "add_permission_wifidialog" into rvc-dev 
* changes:
  [DO NOT MERGE] Add SafetyNet logging
  [DO NOT MERGE] Add permission checking to WifiDialogActivity
 2021-08-09 12:28:48 +00:00
Weng Su
b9b493d39d [DO NOT MERGE] Add SafetyNet logging 
- Add SafetyNet log if the calling package is no the permission for
result

Test: checked eventlog in the bugreport
Bug: 185126813

Merged-In: I1535f6f2ded2445702df0d723518b773cd094164
Change-Id: I1535f6f2ded2445702df0d723518b773cd094164
(cherry picked from commit 199528d460)
 2021-08-09 12:28:31 +00:00
Weng Su
83ccc8f7c5 The wifi dialog text should be Google Sans Text 
- Add fontFamily to override the "google-sans-text" font for SUW theme
only.

Bug: 195089787
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest

Change-Id: I578658fc82ad4d25e5e2e57868cd3aeecb2ab37f
 2021-08-09 15:19:31 +08:00
Julia Reynolds
1129429a7c Fix launch flags for channel panel 
To fix the interaction with the sound picker

Test: launch sound picker from panel, ensure result saved
Test: launch sound picker from panel, cancel
Test: launch more than one panel, make sure all can be edited
Test: change sound from full channel settings page

Fixes: 195739942
Change-Id: I9df86507f8f0cfdd1b0935ca9fe056d24b6d6eac
 2021-08-09 00:55:39 +00:00
Yomna Nasser
e00b6cfa4c Move "Allow 2G" controller under DisabledSubscriptionController. 
Bug: 195576795
Test: manual
Change-Id: Ib42df245394bfbebc832f421ebd6c49bc2dc88d4
 2021-08-08 20:08:18 +00:00