Commit Graph

48763 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Treehugger Robot
87a35ffae5 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: I7515931a772d74ed2bc7f6ab596cad727ebb68c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 12:18:56 +00:00
Treehugger Robot
b2de62c076 Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev 2023-05-16 11:54:24 +00:00
ykhung
24cbb2c0aa Limit the optimization mode restore mechanism for specific conditions
Limit the app optimization mode restore mechanism is enabled by checking
the isValidToRestoreOptimizationMode() method (default false)

Bug: 280192659
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.BatteryBackupHelperTest
Change-Id: I90a438a15905578336bc46ec7cd92d3bbe2858b7
2023-05-16 18:40:11 +08:00
Candice Lo
d79430b971 Merge changes I781cdba1,I13e94ce5,Icafa2109 into udc-qpr-dev am: ca7c7a2a50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241739

Change-Id: I475385746ac3cd2e5f0c7d27bc6d3125217b976f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 09:15:31 +00:00
Candice Lo
ca7c7a2a50 Merge changes I781cdba1,I13e94ce5,Icafa2109 into udc-qpr-dev
* changes:
  Cleaning up tooltip for ToggleFeaturePreferenceFragment
  Cleaning up tooltip for AccessibilityQuickSettingsPrimarySwitchPreferenceController
  Cleaning up Font Size QS tile tooltip
2023-05-16 08:44:49 +00:00
YK Hung
e0e27e408e Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4 am: fad17f0db9 am: 784bfcaade
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826

Change-Id: I3b6be5f053d54053e33436de15e55d339bfa0f89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 07:07:16 +00:00
Zoey Chen
da0f219d15 [Regional Preference] Should not save "default" into Locale. am: ceebc93e89 am: 81c2e53cc0 am: 1c298e1c0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240816

Change-Id: I0ce971860b0c499fb3e575586627b529456b672f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 07:07:07 +00:00
YK Hung
631c72f7d4 Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4 am: fad17f0db9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826

Change-Id: I4d801f3868792744f502d0886f4252b745fea777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 06:47:50 +00:00
Zoey Chen
fd26e0a59d [Regional Preference] Should not save "default" into Locale. am: ceebc93e89 am: 81c2e53cc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240816

Change-Id: Ib8f3b8f4c3a75e58f07b4b2d5cf15f83dced38da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 06:47:43 +00:00
YK Hung
784bfcaade Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4 am: fad17f0db9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826

Change-Id: Ia0e507092addf835e4c931ddd4b01820a313dc00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 06:44:50 +00:00
Zoey Chen
1c298e1c0d [Regional Preference] Should not save "default" into Locale. am: ceebc93e89 am: 81c2e53cc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240816

Change-Id: Id75c615c658ca564b829e338a237d993e3a6ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 06:44:41 +00:00
Candice Lo
3dab6548b9 Cleaning up tooltip for ToggleFeaturePreferenceFragment
Cleaning up QS tile tooltip in the Settings page in onDestroy to avoid
leaking the window.

Bug: 279547549
Test: manually check only one tooltip exists
Change-Id: I781cdba1be7be0315de12cd57620521b40969aee
2023-05-16 06:27:44 +00:00
YK Hung
5956d38f7a Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826

Change-Id: I3773d5d5cd20f2527e32d389479dc798fb86b2ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 06:22:36 +00:00
YK Hung
fad17f0db9 Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826

Change-Id: I3c91272947fa868bb2ae858115bf0af6440b2b97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 06:06:17 +00:00
Zoey Chen
81c2e53cc0 [Regional Preference] Should not save "default" into Locale. am: ceebc93e89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240816

Change-Id: I87625f73240fb2fde72ece84e04beac939f086d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 06:06:08 +00:00
YK Hung
1d818600a4 Merge "Add device build information in the backup stage" into udc-dev 2023-05-16 06:03:41 +00:00