Bill Yi
4b5e237d25
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07961c145e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280850
Change-Id: I2c2e2cc2c41701839f7b05e57d6b784be2a4a120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 16:41:02 +00:00
Julia Tuttle
c08206fc7c
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
am: 35dae4aefd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: I018b1d39d02c42473923a921cdd89fcccb00764c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 16:38:36 +00:00
Julia Tuttle
e7eb3ab983
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
am: 2474419ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: I8d705d71901d00877f9b51faebf7810a18aa20e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 16:37:32 +00:00
Julia Tuttle
7034984e19
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
am: 2474419ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: I88fe8929dc6cebc76430d1d810b8714c619d94e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 16:33:28 +00:00
Julia Tuttle
77c21d9e45
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
am: a31916bd8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: I624e2cc82b796788869bef6a60efb441005bdc1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 16:33:28 +00:00
TreeHugger Robot
dcc2dc11c6
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-05-17 16:29:38 +00:00
Vania Januar
2e8e1339a2
Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev
2023-05-17 16:03:20 +00:00
YK Hung
7568b74b31
Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
am: cdf9452261
am: 7b0f5b38b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578
Change-Id: Ia04c871cc42630002af3a8622cec18f1eaefd080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:57:48 +00:00
YK Hung
10f028f71a
Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
am: b6f257642c
am: 1c546b6fc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578
Change-Id: I6ebefaeafa7b764ae291e11f176538e25c8783fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:52:32 +00:00
YK Hung
29822f8aef
Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
am: cdf9452261
am: 56ce3c42bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578
Change-Id: I40f8d433653add33555cdff82f96b9cd390a061e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:52:13 +00:00
Julia Tuttle
a31916bd8f
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: I1d79800d68eaab91f714fdd3c6810e8059780934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:35:41 +00:00
Julia Tuttle
2474419ac8
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: I2ec0a0f37d2d25c82da35689c2c4af3efcdc7f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:35:26 +00:00
Julia Tuttle
35dae4aefd
Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254
Change-Id: Ia5524ccfb7d3eac04f5aa780494f35650824faec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:31:12 +00:00
YK Hung
1c546b6fc4
Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
am: b6f257642c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578
Change-Id: I1e6d4139662dbf40d7be4cd50411c4bb30838ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:14:45 +00:00
YK Hung
7b0f5b38b7
Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
am: cdf9452261
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578
Change-Id: I4814ae9faac2a6a7049074ca6b78b33974df54d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:14:15 +00:00
YK Hung
bdffa07cb8
Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
am: 9c6d93c40f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578
Change-Id: I017ef5fbf9ab02b13baa053897be9391c5ffe9a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:10:19 +00:00
YK Hung
56ce3c42bb
Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
am: cdf9452261
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578
Change-Id: Ifadf784a346565d56b1345a60bf4708cbf247517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 15:10:19 +00:00
Julia Tuttle
28edfb8df9
Merge "Add FSI toggle to per-app notification settings" into udc-dev
2023-05-17 14:48:50 +00:00
YK Hung
cdf9452261
Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578
Change-Id: I1992e2b356b78c31fc90f6b467d33f739d99e443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 14:33:24 +00:00
YK Hung
9c6d93c40f
Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578
Change-Id: I9b423b11611b88f2a93e2488b9a6ca9361437878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 14:33:22 +00:00
Julia Tuttle
6630c852d9
Add FSI toggle to per-app notification settings
...
Bug: 277938609
Test: atest FullScreenIntentPermissionPreferenceControllerTest
Test: # manual, verifying against "Special app access" screen
Change-Id: I9cb0d9bc99ce59a7b0ff6bcd2cab7a3c2d63f45f
2023-05-17 14:30:49 +00:00
YK Hung
b6f257642c
Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578
Change-Id: Iaa8c51b627d423135a7cfce3a55e360493e1d233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 14:29:10 +00:00
YK Hung
0101e6904f
Merge "Fix b/282944866: Java crash" into udc-dev
2023-05-17 13:45:32 +00:00
Zoey Chen
0ee760da13
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: 9752a7be52
am: 61a0dbe187
am: 0ed957ef3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I76b5bf9698a9fe6291716cde09c83d0a834068cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 12:50:49 +00:00
Zoey Chen
3834eb5f46
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: 3ea5aa92d8
am: 74723cc7dd
am: 2b6c7d7eee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I3b58bdbb161d48a663c0d4f75a01b3c4a54ce3b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 12:50:19 +00:00
Zoey Chen
ed50ad64b8
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: 9752a7be52
am: dfe8a48cab
am: aaaf624700
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: Iee2fbab6a2adce19b3ce6f1a2c0b6bcba7df0fe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 12:49:17 +00:00
Himanshu Gupta
d9f60d9a1a
Clearing obsolete cloneUserId from CloneBackend.
...
When cloned user is removed from device, the previous clonedUserId
present with the CloneBackend instance becomes obsolete, and does
not update to reflect the new clonedUserId, when the cloned user is
re-created.
To fix this we set cloneUserId to -1 when cloned user is removed,
causing CloneBackend#installCloneApp to update clonedUserId when
the cloned profile is re-created.
Bug: 280431074, 275062025
Test: Manual by flashing the local build.
Change-Id: If0d7960998865b4081502e84d0d4125b3b05c69c
2023-05-17 12:22:01 +00:00
Zoey Chen
0ed957ef3d
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: 9752a7be52
am: 61a0dbe187
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: Ia9786659d0d29e3f15220032767093e7a76ccd83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 12:08:02 +00:00
Zoey Chen
2b6c7d7eee
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: 3ea5aa92d8
am: 74723cc7dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: Ieb58079ad123cfeccac7c251a310ba5b2566d3ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 11:58:04 +00:00
Zoey Chen
aaaf624700
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: 9752a7be52
am: dfe8a48cab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I7ed67639a8da9e59ff8df18bc2ee49bc00409853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 11:57:15 +00:00
Zoey Chen
74723cc7dd
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: 3ea5aa92d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I38cb921a77b548d5a891b93f5c6f231377b33269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 11:25:41 +00:00
Zoey Chen
61a0dbe187
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: 9752a7be52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I4dfb9f67e0963fca4d859bc5a667a907d1b71f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 11:25:09 +00:00
Zoey Chen
7cbd01357a
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: a78c4bff00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I60d5e948ec22819255de9e49597b65b544f254f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 11:21:07 +00:00
Zoey Chen
dfe8a48cab
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
am: 9752a7be52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: Ie95a9350cc910aba431e4803b16f063fc32ac8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 11:21:05 +00:00
Zoey Chen
9752a7be52
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I5d3cda5ac33f624a54ae3c1535575c7b56793e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 10:43:04 +00:00
Zoey Chen
a78c4bff00
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I093642000e42c8337b3f5cc6da6097d69da46eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 10:43:02 +00:00
Zoey Chen
3ea5aa92d8
Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700
Change-Id: I359dba215d9ea74e39b528e041c34a2a90d18d05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 10:38:45 +00:00
Zoey Chen
74ab90bb53
Merge "[Regional Preference] Set numbering system when select it" into udc-dev
2023-05-17 09:44:45 +00:00
YK Hung
ad788e8cad
Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271
am: 6a54517f05
am: a316530fd5
am: 7812daefef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576
Change-Id: I2ff1de4d3163106db38121cf6952a421eee675f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 08:35:07 +00:00
Treehugger Robot
e07d9c7f46
Merge "Support RTL for HomepagePreference title" into udc-dev am: 01655c82ca
am: 74bcbbe3c6
am: 6d55148f14
am: 1a38ac9136
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23264119
Change-Id: Iab2c34cd4de1f42bbe8544c10546e5568bfb9c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 08:24:31 +00:00
YK Hung
9260ca9cc7
Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271
am: 6a54517f05
am: d2f9445239
am: d9a8474b6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576
Change-Id: I2b7d75941f11bcc86b986a8310c65aaf6b173d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 08:22:44 +00:00
YK Hung
16cd7a4297
Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271
am: f6ec0ddf5b
am: 6f8b5676a2
am: 68401414ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576
Change-Id: Id978f9ed02bc03c62fe657484192a4647d5c0db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 08:21:33 +00:00
Treehugger Robot
eee789ece7
Merge "Support RTL for HomepagePreference title" into udc-dev am: 01655c82ca
am: f1be9c8683
am: bf6816b9e4
am: 696867b9e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23264119
Change-Id: I507916e6eb6e072537667c400657df96ee833b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 08:17:02 +00:00
Treehugger Robot
273b418753
Merge "Support RTL for HomepagePreference title" into udc-dev am: 01655c82ca
am: 74bcbbe3c6
am: 76fa9bd54a
am: bad77f56ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23264119
Change-Id: I3cb8896a145db86f87e96ed5b7992933cd1eab06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 08:13:33 +00:00
Zaiyue Xue
6235f4b69a
Fix b/282944866: Java crash
...
Bug: 282944866
Fix: 282944866
Test: presubmit
Change-Id: I6dd9d15f21d4fcb3e75847c5727b18bdafbfa09b
2023-05-17 15:59:55 +08:00
YK Hung
7812daefef
Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271
am: 6a54517f05
am: a316530fd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576
Change-Id: Ieb73e93f8ace35909bac947e47fe52fffdf3747c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 06:50:40 +00:00
Treehugger Robot
1a38ac9136
Merge "Support RTL for HomepagePreference title" into udc-dev am: 01655c82ca
am: 74bcbbe3c6
am: 6d55148f14
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23264119
Change-Id: I200301817c251d8d6169c847e7247f8ed5950ab3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 06:50:26 +00:00
YK Hung
d9a8474b6f
Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271
am: 6a54517f05
am: d2f9445239
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576
Change-Id: I2d035ec6a64fb4197fedda73614e6595e0ac46a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 06:46:57 +00:00
YK Hung
68401414ef
Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271
am: f6ec0ddf5b
am: 6f8b5676a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576
Change-Id: I656bee4044e5b13e1b55d2fbeea19ea3842db680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 06:46:33 +00:00
Treehugger Robot
696867b9e9
Merge "Support RTL for HomepagePreference title" into udc-dev am: 01655c82ca
am: f1be9c8683
am: bf6816b9e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23264119
Change-Id: I7152d25e3e39559b0db2e9acdcf1d4ea9a296521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 06:44:56 +00:00