Bill Yi
dcd2b90022
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993
Change-Id: I07cdae04675495c5ed06cd0effdf2381939e54f2
2022-01-09 05:34:28 +00:00
TreeHugger Robot
0f91d91d56
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: da2e65e4ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581998
Change-Id: I8eb8acddb66b72c37413d62585b3a735287c4f21
2022-01-09 05:34:13 +00:00
TreeHugger Robot
9cbff55146
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001
Change-Id: I39f63d24d522944a0828b16b8fa2ee406e49b2fa
2022-01-09 05:33:32 +00:00
Bill Yi
c6e9397fe4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581993
Change-Id: Ic3cc95951c68696f7556bd21bf67d91b37f6e8cf
2022-01-09 05:33:14 +00:00
TreeHugger Robot
212e37eb95
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 577ca44e65
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581990
Change-Id: I5f16a5f4c30bbd5c293e08a13d573c6e19b4f686
2022-01-09 05:26:20 +00:00
TreeHugger Robot
fad8ac95a4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2022-01-09 05:14:26 +00:00
TreeHugger Robot
cc94febb28
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-01-09 05:14:18 +00:00
TreeHugger Robot
9dd4542560
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-01-09 05:13:52 +00:00
TreeHugger Robot
da2e65e4ee
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-01-09 05:13:48 +00:00
TreeHugger Robot
577ca44e65
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-01-09 05:06:07 +00:00
TreeHugger Robot
186d5b6409
Merge changes from topic "presubmit-am-1386b0858a564df381b5c9793cb4de61"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0781839289
Import translations. DO NOT MERGE ANYWHERE
2022-01-09 05:03:58 +00:00
Yasin Kilicdere
7eeb727614
Merge "Add logging for settings entrypoint to add supervised user."
2022-01-07 20:58:14 +00:00
Bill Yi
4cc514c3c3
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3
-s ours am: 5ef6e53bf5
-s ours am: 6930ac9588
-s ours am: 9d0825f6bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736
Change-Id: I5a88db3c390939bd123b43d4800a3b47d0ff2f53
2022-01-07 18:57:05 +00:00
Bill Yi
9d0825f6bd
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3
-s ours am: 5ef6e53bf5
-s ours am: 6930ac9588
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736
Change-Id: I9f6e7ad04936045fed004c2b97ecbe1169491924
2022-01-07 18:34:09 +00:00
Bill Yi
6930ac9588
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3
-s ours am: 5ef6e53bf5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736
Change-Id: I5a9ec3301f4d4649584a57abc8d3776ae2e78311
2022-01-07 18:16:20 +00:00
Bill Yi
5ef6e53bf5
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1940736
Change-Id: I08d291860f76cb1993aae826cb6bd85b4430e52e
2022-01-07 17:48:51 +00:00
Bill Yi
75205dc6b3
Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE"
2022-01-07 17:29:12 +00:00
PETER LIANG
20ec35ec34
Merge "Add new Text and reading options preference into the a11y settings."
2022-01-07 11:39:10 +00:00
Bill Yi
fbe6fd97b9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8b732b18aa1e28bd59972d3ad51f2fa00d0e7973
2022-01-07 10:32:46 +00:00
Bill Yi
f69d80aa34
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iec8d44a0966c47b347de5290f9a3bc5f5c54dc6c
2022-01-07 10:29:08 +00:00
Bill Yi
9fed0efc79
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I089bd7964eff40566f6e0e5f29419ffffd0e8525
2022-01-07 10:25:35 +00:00
Bill Yi
a23cb25511
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I82f24cc8798f2df1ddde782a9019178ca89d70e9
2022-01-07 10:21:29 +00:00
Bill Yi
64a765a14c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifcad6860e4664730c2d0e5826018623ab161db4a
2022-01-07 10:17:54 +00:00
Bill Yi
6ad216fce4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0a648477cbd18dc003cae1dfa61a3387d8f76536
2022-01-07 10:16:21 +00:00
Bill Yi
ac0bd999f1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If79c3e0fd0ebe9847befbf0f32184782cbc5f7e2
2022-01-07 10:14:50 +00:00
Bill Yi
966558f7f7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2a005207a81ddef8b2ea722187a9f4ab73ecb0d4
2022-01-07 10:13:18 +00:00
Bill Yi
a5c8abc5a2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I31226808bce791ecfc6ff0ea175022560229c069
2022-01-07 10:10:34 +00:00
Bill Yi
4067fbe481
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0781839289
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16581988
Change-Id: Ibf06eb6cd3f6157f47d33644b41201b65a608b65
2022-01-07 10:07:17 +00:00
Bill Yi
0781839289
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6c759ce3bdcd7fa8e013aa4711412db766193cbd
2022-01-07 10:07:07 +00:00
Peter_Liang
79a29303ea
Add new Text and reading options preference into the a11y settings.
...
1. Set visible as false until completely finish the feature.
2. This preference has no action temporally, and will continually integrate features into.
Bug: 211503117
Test: manual test
Change-Id: I1404e6eca6bd8246ae844f1a287e6c4872a8fded
2022-01-07 17:22:25 +08:00
Weng Su
7865ab473e
Check WiFi restrictions for WiFi QR code intent am: fe5690598c
am: 0a1ef933ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16544954
Change-Id: I366a1c0a89c16b195f55a3a1fa08830f80a63ee8
2022-01-07 07:59:47 +00:00
Weng Su
0a1ef933ac
Check WiFi restrictions for WiFi QR code intent am: fe5690598c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16544954
Change-Id: Id2ef05626ba9adce5365ab0f928b7bfc3d556246
2022-01-07 07:47:20 +00:00
TreeHugger Robot
18528bce0d
Merge "Disable startup provider due to resource loading issue"
2022-01-07 06:15:13 +00:00
刘琼
41ed094bdc
Disable startup provider due to resource loading issue
...
When run UT case with atest SettingsUnitTests, test failed due to
"Unable to get provider androidx.startup.InitializationProvider: android.content.res.Resources$NotFoundException".
Bug: 208883742
Test: atest SettingsUnitTests
Change-Id: I9843b01fb9d3c2a64e7b52080b2594703cee78a6
2022-01-07 12:13:56 +08:00
PETER LIANG
3907ace408
Merge "Update the preview background of the Caption and Style."
2022-01-07 03:30:43 +00:00
TreeHugger Robot
fe4d991e11
Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment"
2022-01-07 02:48:14 +00:00
Bill Yi
b7d0e28589
[automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: ea1249b895
-s ours am: 9400843a91
-s ours am: 369598c0a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16570397
Change-Id: I19f4d88451b64e5f6fc2bc07665ec936c30e6e8a
2022-01-07 02:43:08 +00:00
Bill Yi
39df254c94
Merge sc-qpr1 to aosp-master - DO NOT MERGE
...
Merged-In: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
Merged-In: I4f51c80cf4e32c384afad849c04c7c6afa065767
Change-Id: Ie466180309fcfe540492967e8bf3587b34928ded
2022-01-06 18:39:02 -08:00
Bill Yi
369598c0a2
[automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: ea1249b895
-s ours am: 9400843a91
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16570397
Change-Id: Ic33a2e4aead117ffd3a2b05146bd68744aaa3733
2022-01-07 02:22:58 +00:00
Bill Yi
9400843a91
[automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: ea1249b895
-s ours
...
am skip reason: Merged-In I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4 with SHA-1 3387491083
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16570397
Change-Id: I4f51c80cf4e32c384afad849c04c7c6afa065767
2022-01-07 02:01:47 +00:00
Betty Chang
6c59266ef4
Merge "Add Enterprise restriction check for Wi-Fi QR code sharing"
2022-01-07 01:51:56 +00:00
Yasin Kilicdere
3a0ebebac4
Add logging for settings entrypoint to add supervised user.
...
Bug: 213442701
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: Ie6110b0ef5c16c9f83e3d939f78f21f003e55e35
2022-01-06 23:21:59 +00:00
Edgar Wang
359512cd95
Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment
...
In onReceive of AppRestrictionsFragment.java, there is a possible way to
start a phone call without permissions due to a confused deputy.
This could lead to local escalation of privilege with no additional
execution privileges needed.
We should not allow the restrictionsIntent to startActivity simply
because it resolves to multiple activities.
Instead, we should call resolveActivity and check the result's package
name is same as current package name, then it is safe to startActivity.
Bug: 200688991
Test: manual verify
Change-Id: Iaa2d3a9497c3266babe0789961befc9776a4db7a
2022-01-07 00:07:16 +08:00
Peter_Liang
b11381762e
Update the preview background of the Caption and Style.
...
Add the background corner to be consistent with the Settings style.
Bug: 213453597
Test: manual test
Change-Id: Icf4526e13c81af9d8431304e04619d4add345aee
2022-01-06 23:58:08 +08:00
PETER LIANG
b43d872018
Merge "Update the background of the Daltonizer preview."
2022-01-06 14:49:10 +00:00
Fabian Kozynski
c8fc56e3bf
Merge "Start brightness dialog in same task"
2022-01-06 14:18:52 +00:00
TreeHugger Robot
cdeb1595cf
Merge "Fix WifiDialogActivityTest broken"
2022-01-06 13:56:09 +00:00
Giuliano Procida
97325d2305
Merge "Revert "Prevent side channel package installation enumeration""
2022-01-06 13:28:58 +00:00
Giuliano Procida
ee8365ca8e
Revert "Prevent side channel package installation enumeration"
...
This reverts commit 8943073514
.
Reason for revert: broke tests, see b/213434244
Bug: 185477439
Bug: 213434244
Change-Id: I7a8fd6086ea59463ef73ade40663cc55b926eaca
Signed-off-by: Giuliano Procida <gprocida@google.com >
2022-01-06 13:03:22 +00:00
Peter_Liang
b408e19f4e
Update the background of the Daltonizer preview.
...
Add the corner radii in to be consistent with the Settings style.
Bug: 213440059
Test: manual test
Change-Id: I68edf243ae33e9bb1e39020ad7553451fad66477
2022-01-06 21:02:50 +08:00