Bill Yi
65145b98d5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddb6d0ea0a
-s ours am: 66c4c78f51
-s ours am: a5752cc09f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278234
Change-Id: I37873ddef4a9ba4a8a38b233ca97b64b19329588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 20:19:53 +00:00
Bill Yi
213a58a284
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6
-s ours am: c0267ceb73
-s ours am: ca1364fd85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280841
Change-Id: I9829e799af1322f2ce475bf2c26b2c2547b3d631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 20:19:06 +00:00
Bill Yi
a5752cc09f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddb6d0ea0a
-s ours am: 66c4c78f51
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278234
Change-Id: I2cd9c0d35f0e628b6c8d1da33ec02b5d62b1a012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:56:46 +00:00
Bill Yi
ca1364fd85
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6
-s ours am: c0267ceb73
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280841
Change-Id: If7c304f19a96c1cb65e72693fdc7a2aa8af709e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:55:33 +00:00
Treehugger Robot
922f602daf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: f65e5dc8df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280843
Change-Id: Ic9927f174745b45757d572ce32bf463aaf4e62e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:39:32 +00:00
Bill Yi
dcc49ba3ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1dce804a35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280843
Change-Id: Ib2f91f8a31d78cd66ab3ca32add68fe57967852d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:39:23 +00:00
Treehugger Robot
9a763f848a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 473d36ec42
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280840
Change-Id: Id2dac107ca3ce97c0a863637c9d9a1dcbb3d83f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:39:15 +00:00
Bill Yi
5268c2cc78
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c796674b36
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280840
Change-Id: Ia72e7cddc3d90f62a78291924e4b0b2a7945a7dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:38:56 +00:00
Treehugger Robot
81d5eecfb3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6258503052
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280837
Change-Id: I00b2b0b80f7b61b6bb29b149544d1bd02f6d0b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:38:38 +00:00
Bill Yi
bbeaca2636
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 363bcc1584
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280837
Change-Id: I73caf0f3c12530f2cf029480622efd7217fc54f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:38:21 +00:00
Bill Yi
66c4c78f51
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddb6d0ea0a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23278234
Change-Id: I8735a21a219b140bb20dc84f8972f80112e3b2fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:34:27 +00:00
Bill Yi
c0267ceb73
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280841
Change-Id: Idd4a46b6bb7ac423690cca74019195aea31b4958
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 19:33:15 +00:00
Treehugger Robot
f65e5dc8df
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-17 18:52:38 +00:00
Treehugger Robot
473d36ec42
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-17 18:52:38 +00:00
Treehugger Robot
6258503052
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-17 18:52:38 +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
Vania Januar
2e8e1339a2
Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev
2023-05-17 16:03:20 +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
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
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
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
0101e6904f
Merge "Fix b/282944866: Java crash" into udc-dev
2023-05-17 13:45:32 +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
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
74ab90bb53
Merge "[Regional Preference] Set numbering system when select it" into udc-dev
2023-05-17 09:44:45 +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
a316530fd5
Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271
am: 6a54517f05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576
Change-Id: Iccbd753d43b4fdd79617c42aa14d8e48402c7c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 06:23:04 +00:00
YK Hung
6a54517f05
Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576
Change-Id: Idd3c88bc1eb26817f3ee19046c75dd2459744fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 06:02:33 +00:00
Treehugger Robot
6d55148f14
Merge "Support RTL for HomepagePreference title" into udc-dev am: 01655c82ca
am: 74bcbbe3c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23264119
Change-Id: Ib6a7c8e4aa3356d6d5d5c7f8fc09c3a207f37ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 05:59:15 +00:00
Zoey Chen
14c81c17ce
[Regional Preference] Set numbering system when select it
...
Should not return original locale, return the locale which is set unicodeLocaleKeyword instead
Bug: 282879594
Bug: 283036197
Test: atest NumberingSystemItemControllerTest
Change-Id: Ic572f20175ea0428be98f30fe865d826b61dcca6
2023-05-17 05:47:53 +00:00
YK Hung
54f39ec271
Merge "Add protection for the BadParcelableException" into udc-dev
2023-05-17 05:05:18 +00:00
Bill Yi
1dce804a35
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9ece5333ddf82a59305c186269e67b01872d8912
2023-05-16 21:46:38 -07:00
Bill Yi
52b4eb39a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I602961ddf48ee427f7e7ae975fbe721fae03c744
2023-05-16 21:41:43 -07:00
Bill Yi
c796674b36
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3bda8fc7baa7c1be9a8d7a731dd103639ecd2dc4
2023-05-16 21:39:10 -07:00
Bill Yi
363bcc1584
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4753ea8fd65f91289869d8dfb89c3c1d82dd77c8
2023-05-16 21:34:12 -07:00
Bill Yi
ddb6d0ea0a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I27580b73ccc5dad4b82850898cc9c71c0e83abeb
2023-05-16 21:29:01 -07:00
Treehugger Robot
74bcbbe3c6
Merge "Support RTL for HomepagePreference title" into udc-dev am: 01655c82ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23264119
Change-Id: I2ed39732731754479d798d59fe7ea99874e1f98b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 04:15:39 +00:00
ykhung
b42a509914
Add protection for the BadParcelableException
...
Test: presubmit
Bug: 282943714
Change-Id: I9f2bffbbbd3df4a31887ecc869d3c046b25755e0
2023-05-17 03:38:13 +00:00
Treehugger Robot
01655c82ca
Merge "Support RTL for HomepagePreference title" into udc-dev
2023-05-17 03:33:51 +00:00
Yanli Wan
7cee2b2ed1
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937
am: 29a97efcf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508
Change-Id: I7d0e2f019653aec610ee1b535fcf9ab96bd4bac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 00:39:32 +00:00
Yanli Wan
29a97efcf9
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508
Change-Id: I4e11dc29b4e12e42de3cb55452902224a771c3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 00:19:01 +00:00
Treehugger Robot
d154bff854
Merge "LEA developer option is enabled if the BT LEA flag is enabled" into udc-dev am: 6814775fea
am: ee1c86830d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23249483
Change-Id: Iad877e0d98a647c8c90bb1d440d7c9eb7f922fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 00:18:51 +00:00
Yanli Wan
f5ce620937
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev
2023-05-16 23:47:46 +00:00
Treehugger Robot
ee1c86830d
Merge "LEA developer option is enabled if the BT LEA flag is enabled" into udc-dev am: 6814775fea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23249483
Change-Id: I7e49723d26bcd27e80cfde088d3e66813fc41f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 23:36:04 +00:00
Treehugger Robot
6814775fea
Merge "LEA developer option is enabled if the BT LEA flag is enabled" into udc-dev
2023-05-16 22:08:13 +00:00
Yuxin Hu
b12ebe2b73
Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74
am: 0b7a88282d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112
Change-Id: I8c540f588899ccd6e8e4baed573972df02f8f474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 20:42:52 +00:00
Yuxin Hu
0b7a88282d
Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112
Change-Id: I211c5ae0aa764a885957573622af13be0e288206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 19:04:08 +00:00
Treehugger Robot
50260c19d2
Merge "Hide "Long Background Tasks" page from Settings." into udc-dev am: b272dbc613
am: dbf7472854
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23252718
Change-Id: I623996d146f0ebab242e34ec82318e8df91b453e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 18:42:45 +00:00
Yuxin Hu
174bd2ab74
Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev
2023-05-16 18:24:14 +00:00