Commit Graph

124431 Commits

Author SHA1 Message Date
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
Edgar Wang
41eeb31b20 Update theme for ChannelPanelActivity
- set correct switch style
- update background color

Fixes: 238845212
Test: visual
Change-Id: Iaf54fa5d98f7527543fc02d1108cbafe851bd574
2023-05-16 10:06:59 +00:00
Avinash Vadlamudi
cc1b643a79 [Auto Pin Confirmation]: Increase the touch target of checkbox to 48dp for accessibility
Bug: 281945287
Test: Manual test by flashing on device and verifying using layout bounds
Change-Id: Ibfbb3f3e7e8307c9ec5c01226c24da10fb5e080a
2023-05-16 10:06: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
30bcbca9c1 Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4 am: fad17f0db9 am: 631c72f7d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826

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

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

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

Change-Id: I28b7e50f8a5be7e7e45da9687ab53b6dde1f75d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 07:07:31 +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
c21833c667 Merge "Add device build information in the backup stage" into udc-dev am: 1d818600a4 am: 5956d38f7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240826

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

Change-Id: Ic7abcc6361010e3b264967cb472796903e93670a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 06:48:12 +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
TreeHugger Robot
6fbabde76f Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382 am: 5b26562be8 am: 0e59b1cd15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981

Change-Id: I1d53af2589536035ed4cb45aee12f8a0385d6374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 06:06:58 +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
64ae706855 Merge "[Use] Replace settings LocalePreference with androidx LocalePreference" into udc-dev am: ab32753382 am: 5b26562be8 am: 23cd09fd9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23232981

Change-Id: Idb1bd0210b3da6a0b6cc5479f47621a7c5f3b639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:40:19 +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
23cd09fd9e 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: Ie1da2deef4a997a2955c7d14b41ae8a041fab56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 05:17:58 +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
Candice Lo
dad011f5ba Cleaning up Font Size QS tile tooltip
Cleaning up Font Size QS tile tooltip in the Settings page in onDestroy
to avoid leaking the window.

Bug: 279547549
Bug: 279549685
Test: manually check only one tooltip exist
Change-Id: Icafa2109af316989330bda5ed831c2f746e7968b
2023-05-16 03:39:10 +00:00
ykhung
cad41681d6 Add device build information in the backup stage
Insert the device build information in the battery optimization mode
backup stage, such that we can use it to decide whether we should
restore the data in the targeted device or not

Bug: 192523697
Test: make test RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.fuelgauge.*

Change-Id: I3ab76e013ea9aca4d336a62e0c7cb6882c5b5085
2023-05-16 11:07:31 +08:00
TreeHugger Robot
828bd8db86 Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d am: c59fbb1d28 am: 98fa5ffbfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080

Change-Id: I6ea91cfd51f9ff63cb77cc6713d2c0a1279c3394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 02:10:06 +00:00
TreeHugger Robot
fe4386e249 [automerger skipped] Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12 am: e4510d3bf5 am: 4017503fb8 -s ours
am skip reason: Merged-In I2587b50b75a161c7b19f1e3430e41b98cfe6cf63 with SHA-1 d126303343 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357

Change-Id: I9c011c2a44e47a2b68ffab115517a4ab5446d7f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 02:10:04 +00:00
TreeHugger Robot
b49e48bcf9 Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d am: e12013a755 am: 009455ee17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080

Change-Id: I43d81772658c1f2222dfd58a8615952d2ef19f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 02:09:37 +00:00
TreeHugger Robot
830b0d2ff1 [automerger skipped] Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12 am: 8caf202fc8 -s ours am: 84b0e5c316 -s ours
am skip reason: Merged-In I2587b50b75a161c7b19f1e3430e41b98cfe6cf63 with SHA-1 d126303343 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357

Change-Id: Id139a71b88c0cbf8bb019ce318910fe5c2e6a6cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 02:09:36 +00:00
TreeHugger Robot
f110425ef5 Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d am: c59fbb1d28 am: 8d01fc110b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080

Change-Id: I83a204adb181023633d51c3142b07d9f2ef173d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 02:08:26 +00:00
TreeHugger Robot
46e2910d4f Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12 am: e4510d3bf5 am: 65ed3fde0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357

Change-Id: I5e43f7d83df156119e18f2f52f2cfcb00c65ebd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 02:08:24 +00:00
Yuxin Hu
2cbb587f81 Toggle switch back when user dismisses dialog by tapping screen
The reboot dialog can be dismissed when user:
1) Clicks any button on the reboot dialog
2) Taps any screen area outside of reboot dialog

We want to toggle back the "Enable ANGLE" switch
whenever the user chooses to not reboot the device
immetiately.

This change adds the function to toggle the
"Enable ANGLE" switch back when:
1) User clicks "Cancel" on reboot dialog.
2) User taps screen area outside of reboot dialog
to dismiss the reboot dialog.

Bug: b/270994705
Test: m; flash and device can boot.
atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest

Change-Id: I84fde5ea5bae9d8793bcef30f4c37d832152ae43
2023-05-16 01:58:25 +00:00
Varun Shah
82dc52376a Hide "Long Background Tasks" page from Settings.
Since the RUN_USER_INITIATED_JOBS permission is no longer a special
permission, the related page in Settings should be hidden.

Bug: 282824927
Test: page hidden from Special App Access screen.
Change-Id: I51d681f97247be45654dd2eb12df08f429a43938
2023-05-16 01:53:33 +00:00
TreeHugger Robot
98fa5ffbfa Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d am: c59fbb1d28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080

Change-Id: I5452381cb4a4e8cf59895794f753529ce0740bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 01:23:12 +00:00
TreeHugger Robot
4017503fb8 Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12 am: e4510d3bf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357

Change-Id: I2fc962a2f75a2feae42c45cf6f7629659cd498ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 01:23:11 +00:00
TreeHugger Robot
009455ee17 Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d am: e12013a755
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080

Change-Id: I481a8c9e70e3d05b6c59828809732a8ccd6a8dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 01:22:48 +00:00
TreeHugger Robot
84b0e5c316 [automerger skipped] Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12 am: 8caf202fc8 -s ours
am skip reason: Merged-In I2587b50b75a161c7b19f1e3430e41b98cfe6cf63 with SHA-1 d126303343 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357

Change-Id: I9debcff79deba789224b1cafc3bdeb385f839db5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 01:22:46 +00:00
TreeHugger Robot
8d01fc110b Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d am: c59fbb1d28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080

Change-Id: I0d7a7380fc36fb1870b8931fcc64616ec9d7fe56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 01:21:45 +00:00
TreeHugger Robot
65ed3fde0a Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12 am: e4510d3bf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357

Change-Id: I0ed1958d0085ba6c9662ae3bf15905973586d0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 01:21:43 +00:00