Commit Graph

49747 Commits

Author SHA1 Message Date
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
9dbf6c0fae Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74 am: 31892d4acd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112

Change-Id: I6d22df8ee2f68816796c8440a95ba8895abf15ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 20:13:31 +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
Treehugger Robot
06f11e26a2 Merge "Hide "Long Background Tasks" page from Settings." into udc-dev am: b272dbc613 am: aa55b9dde7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23252718

Change-Id: If9b5cd2f1596690131db88606473c271e319d538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 18:40:33 +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
ffe2b87e41 Merge "Limit the optimization mode restore mechanism for specific conditions" into udc-dev am: b2de62c076 am: fff8a890cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241740

Change-Id: I43c18a7f7191e194f15b4c5bc6470f056933c74c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 13:04: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
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
01965cf83a Merge changes I781cdba1,I13e94ce5,Icafa2109 into udc-qpr-dev am: ca7c7a2a50 am: d79430b971
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23241739

Change-Id: I3f5b918b26af2f09e357cb9d9fd5a1a5658ce800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 09:56:57 +00: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
YK Hung
65c2154c3b Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4 am: 2427d3b57a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826

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

Change-Id: I77b4127d0c76ef0428ba62347ea844ffaaaaa0d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 06:43:45 +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
Zoey Chen
d4231cb9c4 [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: I6cd310944faf4ba9a91a0c3b949007195d8a7ac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 06:02:05 +00:00
TreeHugger Robot
86d04fbf04 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382 am: e51a854b93 am: fea14cdaa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981

Change-Id: I086177211869c15c4a62116efd213384d9f5d481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:40:03 +00:00
TreeHugger Robot
0e59b1cd15 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382 am: 5b26562be8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981

Change-Id: I30b4a9b8af2d48dc4bb5a29e725a36693417edfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:22:09 +00:00
TreeHugger Robot
e35e12bca5 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382 am: b0d27a8b53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981

Change-Id: I1cbb4d7e4676e83b28f994b98479fe5c84beb086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:18:13 +00:00
TreeHugger Robot
fea14cdaa0 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382 am: e51a854b93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981

Change-Id: If0e90b392097e3c3681e62bac0d392bea5f328ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:00:49 +00:00
TreeHugger Robot
5b26562be8 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981

Change-Id: Ibf6c8620cbb7eccbeb3df3db47c02782c9a36c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 04:37:03 +00:00
TreeHugger Robot
e51a854b93 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981

Change-Id: I9ba8cd5db9fbcdbee5e4a9a44c278c13bbe89930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 04:32:37 +00:00
Zoey Chen
ceebc93e89 [Regional Preference] Should not save "default" into Locale.
Set wrong value in the previous refactory changes, should set valus as null when the default is selected

Bug: 281993323
Test: manual test and QA test
Change-Id: I897791a38a50588d7d721bf57c0d7bdc1734e189
2023-05-16 04:00:07 +00:00
TreeHugger Robot
ab32753382 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev 2023-05-16 03:51:45 +00:00
Candice Lo
cb92ae1096 Cleaning up tooltip for AccessibilityQuickSettingsPrimarySwitchPreferenceController
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: I13e94ce549e19fd54c9034f3b3372ecf40388e39
2023-05-16 03:43:20 +00:00