Vania Januar
0277f1676e
Merge "Disambiguate default notes app user from stylus settings" into udc-qpr-dev am: 2e8e1339a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22990296
Change-Id: Iabe40045f8193d3b532881d454fd0cf22c748953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 16:41:30 +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
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
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
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
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
0101e6904f
Merge "Fix b/282944866: Java crash" into udc-dev
2023-05-17 13:45:32 +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
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
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
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
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
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
6f8b5676a2
Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271 am: f6ec0ddf5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576
Change-Id: I7c4102972ae8650f4677a061d463151f87f03618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 06:02:48 +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
YK Hung
f6ec0ddf5b
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: Ia536e60ca56dbecbad8e49489af79527da268a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 06:00:02 +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
ykhung
b42a509914
Add protection for the BadParcelableException
...
Test: presubmit
Bug: 282943714
Change-Id: I9f2bffbbbd3df4a31887ecc869d3c046b25755e0
2023-05-17 03:38:13 +00:00
Yanli Wan
a2bf21667b
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937 am: 433d934b89 am: 98c03bb946
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508
Change-Id: I3ad3860012c9200c7f97323d3f52ad88e93cf946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 01:24:55 +00:00
Treehugger Robot
ae8f514fd7
Merge "LEA developer option is enabled if the BT LEA flag is enabled" into udc-dev am: 6814775fea am: ee1c86830d am: 8d0bca9d4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23249483
Change-Id: Iecaa8aa8be8646a04268c10e34c28b2cbc0cde73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 01:23:00 +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
98c03bb946
Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937 am: 433d934b89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508
Change-Id: I96a6dfc9fa2697965d3fb1eb1187645283b31fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 00:21:51 +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
Treehugger Robot
8d0bca9d4a
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: Ia333520b9511ad43e737d2f3e1e10aac3602c5c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 00:16:51 +00:00
Yanli Wan
433d934b89
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: I05e673c9f6e1db8aabef3a66e9f8c569e96e5850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 23:57:53 +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
40462b2520
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: I864882abbe368c1e0883d8b68c63e7e09b5c681a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 23:36:55 +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
070959a02d
Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74 am: 0b7a88282d am: f28b2b4b83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112
Change-Id: I965a6bdd06e87eae30a5eb8650474754eae48b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 20:12:43 +00:00
Treehugger Robot
8d265f34fb
Merge "Hide "Long Background Tasks" page from Settings." into udc-dev am: b272dbc613 am: dbf7472854 am: 1b61fee893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23252718
Change-Id: If3f03a724c223c218fd5f02b6cc1b4e3718103b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 20:10:05 +00:00
Yuxin Hu
f28b2b4b83
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: Iaa26c0dc435ab9b6f32daa9ce49f88234f349162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 20:08:07 +00:00
Yuxin Hu
9fcd85c5f8
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: I6fcae10eabb687454e4611cd29087917c781048e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 19:05:13 +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
Treehugger Robot
1b61fee893
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: Iaa73048171065b9d2816e38eca5eb2bfaf97f27a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 18:40:43 +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
Treehugger Robot
3c2aa8843e
Merge "Hide "Long Background Tasks" page from Settings." into udc-dev am: b272dbc613
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23252718
Change-Id: Ie9099059b0af1947c2c9659e1c85012a5b90240d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 18:01:40 +00:00
Treehugger Robot
dbf7472854
Merge "Hide "Long Background Tasks" page from Settings." into udc-dev am: b272dbc613
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23252718
Change-Id: Ieee0605442ad79b198129dcb312eef7be86201f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 18:00:46 +00:00
Treehugger Robot
b272dbc613
Merge "Hide "Long Background Tasks" page from Settings." into udc-dev
2023-05-16 17:31:12 +00:00
Yanli Wan
ad151bf1e7
Start activity from Device Lock APEX if device is provisioned by Device
...
Lock
Bug: 279616148
Test: atest DeviceLockPreferenceControllerTest
Test: Build & test locally
Change-Id: Ieb2ea691136749d034bceb9412744af874d6abb9
2023-05-16 17:03:45 +00:00
Vania Januar
64d64fdd36
Disambiguate default notes app user from stylus settings
...
Users can now select between work or personal notes app to be the app
that opens when the stylus tail button is pressed via a dialog.
Bug: 278555728
Test: StylusDevicesControllerTest
Change-Id: I9c63de6f11deb357b0497c7b972d4ac19b876e1f
2023-05-16 15:57:09 +01:00
Treehugger Robot
01db8ffbd9
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076 am: 1c49e15945
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740
Change-Id: Ic09fa161dcfba3a7945b5f7bd7685c6265e2454b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 13:08:07 +00:00
Treehugger Robot
2d73558d68
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076 am: 87a35ffae5 am: 218e3151c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740
Change-Id: Ida698226b8311aec208646cbdec0e8caa0dc0f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 12:46:41 +00:00
Treehugger Robot
218e3151c1
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076 am: 87a35ffae5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740
Change-Id: I304e73c7cae7c5669694296002916a5601c8b4a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 12:25:51 +00:00
Treehugger Robot
1c49e15945
Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740
Change-Id: I6c31dcf53c8a8586028fa5c3cb350c7c947b95b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 12:23:14 +00:00