PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,166 Commits 1 Branch 0 Tags
e0cc807a09b402db35c20beec4f999f799bb18b7
Commit Graph

83166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
e0cc807a09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 57641d0db8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3408bedc4ee206ceb22dca0a61e19fdd11b0294b
 2021-08-10 19:39:58 +00:00
TreeHugger Robot
282a8c66c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9aa8b8906e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I405927f0d2ea72cbc09861162de46b1d9fd133d0
 2021-08-10 19:39:28 +00:00
TreeHugger Robot
57641d0db8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:25:35 +00:00
TreeHugger Robot
9aa8b8906e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:25:19 +00:00
Bill Yi
385f45f7a0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iebb44c911ceb4598c1653402af1d3b91b2b62a55
 2021-08-10 15:29:49 +00:00
Bill Yi
2c121e8336 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I905ee0fb3da18a7bd2311f97da60b7735a36678a
 2021-08-10 15:23:37 +00:00
Tom Hsu
1d8c6a6188 Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710

Change-Id: I1b126ab2dabd818a2675d8b2ac26f6a7949e13cf
 2021-08-10 06:13:41 +00:00
Tom Hsu
939136b34b Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev 2021-08-10 06:00:44 +00:00
Tom Hsu
a17fc042dd Selects a active sim to MobileNetworkActivity w/o subscription ID input 
Bug:194754151
Test: Sanity test with test build. See b/194754151#21

Change-Id: Ic3449392a7f564b69c3f42cc762ec4c9ec642797
 2021-08-10 04:40:52 +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
4cb6d12b55 Merge "Make face education handle timeout result correctly" into sc-dev 2021-08-10 00:06:17 +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
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
9000bdc25f Merge "The wifi dialog text should be Google Sans Text" into sc-dev 2021-08-09 19:59:07 +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
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
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
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
TreeHugger Robot
688eccdf1f [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours am: 24d844a02c -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I6ecf83615758a8cc62adda6412660958011cb1a2
 2021-08-08 14:42:02 +00:00
Weng Su
456c9fe228 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours am: 33cd50085a -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I5f6641e6894120efc57f2ede0ddd856f9ac0c673
 2021-08-08 14:41:59 +00:00
Weng Su
beea2f4822 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours am: befd5bcd14 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Id639dbe0480f6de49a7a778360cc6499fe064602
 2021-08-08 14:41:58 +00:00
TreeHugger Robot
24d844a02c [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: 37a5ccd1f0 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I6b77f4da1b841bf6dc0d624ce691db846f4aa340
 2021-08-08 14:27:30 +00:00
Weng Su
33cd50085a [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 90e455e519 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Ie18c55d7aae7b45ae0fbccb830a641232830e002
 2021-08-08 14:26:39 +00:00
Weng Su
befd5bcd14 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: eb1e97e195 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Idbef656341c36455e9bc6f89b87d1a2429fce656
 2021-08-08 14:26:37 +00:00
TreeHugger Robot
2d1e24e446 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: b1119ffc7c -s ours am: 0ae43531ef -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I8707b6e063a9730b0e34be8f00848d8ee51b51de
 2021-08-08 14:04:28 +00:00
Weng Su
28db8e5cc0 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 3cb57e2769 -s ours am: 44ceeecf3f -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: Iaf597118a86d0f25832a06b5f1a7c059f53e195a
 2021-08-08 14:04:23 +00:00
Weng Su
4740c1f4b8 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: d93ffd8c3a -s ours am: ead0c8eb2d -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I1baba5810c5753e651792db6ce52aab6a9b9ae60
 2021-08-08 14:04:23 +00:00
TreeHugger Robot
0ae43531ef [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours am: b1119ffc7c -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: Ic6f4a9f4af7a15d86aa7f7569141875590f91192
 2021-08-08 13:54:13 +00:00
Weng Su
44ceeecf3f [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours am: 3cb57e2769 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I8593c428c1337dd5f331af664fd6b14e79733785
 2021-08-08 13:54:08 +00:00
Weng Su
ead0c8eb2d [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours am: d93ffd8c3a -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I6f6f7d911c9d769e4e47727540fc4691319a9b18
 2021-08-08 13:54:06 +00:00
TreeHugger Robot
b1119ffc7c [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: Id9fe7fd0621bd78ac529c5ce07097a871d5d3818
 2021-08-08 13:39:53 +00:00
TreeHugger Robot
37a5ccd1f0 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours am: 24f87e15e2 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I05e285d6d57f7c9c757b5e7628f1a76678214c7a
 2021-08-08 13:39:48 +00:00
Weng Su
3cb57e2769 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I5328b3400289af6d6195233efe3addffc3b6306c
 2021-08-08 13:39:48 +00:00
Weng Su
d93ffd8c3a [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I621f6cddee8b915afdd479a536043b2b50fa48ee
 2021-08-08 13:39:46 +00:00
Weng Su
90e455e519 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours am: b1c88160e2 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I193f178c5fd49e19b07fe7d011777674a6d6865e
 2021-08-08 13:39:44 +00:00
Weng Su
eb1e97e195 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours am: 586ca2dfa8 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I8980230d20465854434b004e18eca553cb2b222b
 2021-08-08 13:39:42 +00:00
Weng Su
f973f2ac69 [DO NOT MERGE] Add permission checking to WifiDialogActivity 
- Use getCallingPackage() to get calling package.

- Check if the calling package has ACCESS_COARSE_LOCATION or
ACCESS_COARSE_LOCATION permission.

- Only set result data to permission granted callers

Bug: 185126813
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Merged-In: If7ca069c842ed2bd1aed23f9d4041473c68a4dad
Change-Id: If7ca069c842ed2bd1aed23f9d4041473c68a4dad
(cherry picked from commit 71e728e934)
 2021-08-08 13:21:52 +00:00
TreeHugger Robot
24f87e15e2 [automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a am: 8eff11f477 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

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

Change-Id: I39d5571947793d0164cf470942f36d82800f6405
 2021-08-08 13:02:10 +00:00
Weng Su
b1c88160e2 [automerger skipped] Add SafetyNet logging am: 62041d683b am: 8df9b236f8 -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: I7621025b320cc47c10535daa8dbf48c77c1cf2f6
 2021-08-08 13:02:04 +00:00
Weng Su
586ca2dfa8 [automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527 am: fa62e69c1d -s ours 
am skip reason: skipped by user wengsu

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

Change-Id: If5de8e30d74531914febee1636c1b123a6bf0754
 2021-08-08 13:02:03 +00:00
TreeHugger Robot
8eff11f477 Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212651

Change-Id: I4394ae315b4458b9d62c825075a120d214f49161
 2021-08-07 17:37:47 +00:00
TreeHugger Robot
189d26ff2a Merge "Add comment to AndroidManifest" into qt-dev 2021-08-07 17:18:31 +00:00