Commit Graph

15939 Commits

Author SHA1 Message Date
Peter Zhang
1efb727214 Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039 am: 521e527edd am: 8b7482cb5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121951

Change-Id: I392da92d26fe4aede85f8028f11bf025a7a40d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:51:27 +00:00
Peter Zhang
f7d5dec825 Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev am: 04545138c7 am: 4d0120712f am: fbcc7d6ad2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085599

Change-Id: I4aefeee698974311536302ab848d575df5f55449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:44:52 +00:00
Peter Zhang
60069d3039 Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev 2023-05-12 16:22:38 +00:00
Peter Zhang
04545138c7 Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev 2023-05-12 16:09:34 +00:00
Jason Hsu
4ecbb9c13c Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 3f6e93beea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: Ic1ce1c748c2ee749b4a73256a8d850df1232bb6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:06:05 +00:00
Jason Hsu
782ad66ab1 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I1abbb60af43135718426d349427738d95808ff50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:23:10 +00:00
Jason Hsu
181cfa3aa5 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev 2023-05-12 14:20:23 +00:00
Peter Zhang
cede538007 Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev am: 5b81bbfd02 am: 884e3b3ef8 am: 782ba7d863
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085598

Change-Id: I56311f1c0e8de1f0d7ae1bf82f36e491eabc015b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:50:07 +00:00
Peter Zhang
2c67934623 Merge "Expand SettingsLib ProviderTile to support non-switch type of Preferences" into udc-d1-dev am: 15a11c4123 am: 4b387512f7 am: 3ace2947f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23050050

Change-Id: I9fe2db8ac0c7747f56be7b3067cbfb42f3ba0bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:48:56 +00:00
Treehugger Robot
9c5811bfe2 Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60 am: e9091d1d7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: I8913fedd1d1a34700631d284af2639dea7d0591f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:22:31 +00:00
Treehugger Robot
a823380436 Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: I78e897de5a2198f21de61422b88adbc4cf7aa34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:43:30 +00:00
Peter Zhang
f6a267bd36 Add logging when a group tile with PreferenceCategory widget is added to
the screen

Test: robotest, manual
Bug: 281517110
Change-Id: I4de1938bdeea003c70e5c554e988a97b762f7f81
2023-05-12 14:41:32 +02:00
Peter Zhang
baeca6fb53 Add the support of preference group / category to the Settings Tile API
Test: robotest, manual
Bug: 281517110
Change-Id: Ie36b0b3eb8ed80766efa050f1f0aee1f784a5949
2023-05-12 14:40:41 +02:00
Treehugger Robot
e99f757f60 Merge "Update battery settings remaining time format" into udc-dev 2023-05-12 12:29:14 +00:00
Oli Thompson
d134502801 Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: 6ea5106ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: Ia40eb7110721165bf4fdd25705ba68c22d48b32a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:17:54 +00:00
Peter Zhang
5b81bbfd02 Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev 2023-05-12 12:12:21 +00:00
Peter Zhang
15a11c4123 Merge "Expand SettingsLib ProviderTile to support non-switch type of Preferences" into udc-d1-dev 2023-05-12 12:08:00 +00:00
Oli Thompson
787a054c93 Merge "Update Work profile settings" into udc-dev 2023-05-12 11:05:57 +00:00
Wesley Wang
77deb463a0 Update battery settings remaining time format
- Update the remaining time format to align with status bar
 - Remove unused test case since no more less than 7 or 15 remaining time
   case for battery settings
 screenshots:
   https://screenshot.googleplex.com/8jPYPj7yznGFU4b.png
   https://screenshot.googleplex.com/5GYXA2tusSUVmVQ.png
   https://screenshot.googleplex.com/3EnB3ejAxAzP28q.png
   https://screenshot.googleplex.com/5jeUxwBEyHotf9d.png

Bug: 281685505
Test: make SettingsLibRoboTests
Change-Id: If33e1828582845f78d8ef666c2b74ab5bba22357
2023-05-12 11:05:05 +00:00
Tom Hsu
532b306fb1 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 2dfa7516f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I137bdf47b966c90def67144034e7d61206b8ebac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:42:24 +00:00
jasonwshsu
212470d0a6 Move 'Audio Output' to Accessibility hearing device page
* Extract the common part into HearingAidHelper.
* Remove abstract getHearingDevice(). Change to get the hearing device when needed.
* Move several classes from Bluetooth into Accessibility

Bug: 281783079
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(HearingDeviceAudioRoutingBasePreferenceControllerTest|AccessibilityHearingAidPreferenceControllerTest|HearingAidHelperTest|HearingAidAudioRoutingPreferenceControllerTest|HearingDeviceCallRoutingPreferenceControllerTest)"
Change-Id: I79049107409b7086c6dcc8d48a6323e171ed1535
2023-05-12 13:46:53 +08:00
Tom Hsu
0af8c60342 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev 2023-05-12 05:16:28 +00:00
Zoey Chen
814bcdc33d Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 34911e336c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: Ie1affc5347d3bad2da6672efe2faffca5536c0bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 04:34:46 +00:00
Zoey Chen
4d917d990f Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev 2023-05-12 03:37:37 +00:00
TreeHugger Robot
d98494ea88 Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e am: 8fa511ea87
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345

Change-Id: I7a1a8a8f9830f0cf09d5dc3a6d276baabe05dd9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 02:48:46 +00:00
Zoey Chen
fb6b6b0bcc [Panlingual] Do not show dialog in recycle. Set LocaleEditor as the
parent fragment and control the dialog.

Keep the dialog and the locale list after rotation

Bug: 279527362
Change-Id: I349fd9d0fea5b43a8bbb2a23fa60fc4c5436c5cf
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Test: atest LocaleDialogFragmentTest
2023-05-12 02:40:13 +00:00
TreeHugger Robot
b7b444896e Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev 2023-05-12 01:34:00 +00:00
Hao Dong
2c3346a4e6 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: 771df2f4a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: I19309051047d2b5f504ba8c8f6a9f9e591ddd4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:32:18 +00:00
Hao Dong
1eb3724e1f Merge "Hide description text view if there is overlap." into udc-dev 2023-05-11 22:10:55 +00:00
Yuxin Hu
4235638174 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: e58d73a958
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I9741ceb39a659056384baebd1577c0ae142ef084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:06:31 +00:00
Yuxin Hu
6e3aba5366 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev 2023-05-11 20:48:57 +00:00
Yuxin Hu
715a70603c Add AndroidJUnitTest for developer option switch
Bug: b/270994705
Test: m -j45
atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest

Change-Id: Idbb93458a64894c3eba78a8f9373c40e3ddf35c5
2023-05-11 17:59:21 +00:00
Hao Dong
cddf296c82 Hide description text view if there is overlap.
1. Includes udfps enroll view in xml files and cleans up FingerprintEnrollEnrolling adding udfps enroll view code.
2. Clean up SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS flag.
3. If description text view has overlap with udfps progress view, hide the description text view.

Test: atest FingerprintEnrollEnrollingTest
Test: manually test by setting both display and text largest size and
start enrolling fingerprint; the description is hidden if it's too long.
Bug: 260970216
Change-Id: I085dc62993ffa22d018dd57517c96d69e9d9cbcb
2023-05-11 17:34:07 +00:00
Hao Dong
c753221adf Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev 2023-05-11 17:17:06 +00:00
tom hsu
5e2862f2e3 [Settings] Avoid to unregister wrong observer
Bug: 262345047
Test: atest passed.
Change-Id: If324e8f35c15053b48320f86ff22759a6a68a62f
2023-05-12 01:10:19 +08:00
TreeHugger Robot
d44a69b9fb Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85 am: 341ec2f35f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341

Change-Id: Id5314e4a70ba4d0261ced8ede394090a6505aeb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:25:49 +00:00
Weng Su
e485615662 Fix failing test cases in MobileNetworkSummaryControllerTest
- Remove obsolete test items

- Update the new callback interface

Bug: 280044539
Bug: 280044731
Test: Manual test
atest -c MobileNetworkSummaryControllerTest

Change-Id: I8460c620c62981dd5ee3b280c1a7467c43dbceb1
2023-05-11 14:15:07 +00:00
Oli Thompson
08b4973f8e Update Work profile settings
Change work apps toggle to a primary toggle
make Xprofile contact search toggle disable/enable when work profile is turned off
Add footer and change strings
Add tests

Test: atest ContactSearchPreferenceControllerTest, atest WorkModePreferenceControllerTest

Bug: 253009702 275538029
Change-Id: I3b2044a5fe3f2aff0748d66e701a3f0d7667ab7a
2023-05-11 14:02:27 +00:00
TreeHugger Robot
c271732a85 Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev 2023-05-11 14:01:25 +00:00
Weng Su
571d9b1f37 Fix failing test case in AllInOneTetherSettingsTest
- Add the necessary mock classes

Bug: 280067520
Test: Manual test
atest -c AllInOneTetherSettingsTest

Change-Id: I6576c6997b43103ea810008b7a1a245e3e42015c
2023-05-11 20:43:34 +08:00
Treehugger Robot
a9b0957d8b Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633 am: 13bb6301e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: If5b6bc91aaea94041a39d8567e9b6eab3d5367fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 12:15:45 +00:00
Treehugger Robot
1b91f61633 Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev 2023-05-11 10:54:55 +00:00
Tom Hsu
27a0488790 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 9d3ac48f44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: If2e552263d63342ec69eb3b93ccf357c60bcf59b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 05:32:17 +00:00
Tom Hsu
5576947555 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev 2023-05-11 04:30:19 +00:00
Angela Wang
cd1a68db34 Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: ae04daac19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: Ic2362f572bd3be5a857788e62d9e6afb97e06b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 03:00:38 +00:00
ykhung
8f56114489 Record app optimization mode backup into BatteryHistoricalLog
App optimization mode format:
https://screenshot.googleplex.com/di9DDzBfYf7ihfV

App optimization mode backup format:
https://screenshot.googleplex.com/GkVW5HrgGvmv5yh

Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I60a9a76a8ffc89d625ee3f77c138a19181c81c38
2023-05-11 10:48:47 +08:00
Angela Wang
22d3116188 Merge "Disabled state UI of Flash Notifications preview button" into udc-dev 2023-05-11 01:41:47 +00:00
Hao Dong
755a67a931 Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen.
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
Merged-In: Ie4bc18bf245eb7a755862401c710d85381063ff9
2023-05-10 23:26:02 +00:00
Treehugger Robot
c05a1f20ae Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf am: d5d3d55bbd am: 13e131f352 am: 8e40694817
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776

Change-Id: I86e10f707410a1c0878a0119cc03e0e80c7489c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 21:28:37 +00:00
Treehugger Robot
17facb603f Merge "Refine optimize page log pattern" into udc-dev am: d865ccc2ed am: 48002a9d03 am: 961a19c1f8 am: ca3dd86485
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129577

Change-Id: Ica08043dff2238a9330a30e78305049d9433a040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:40:36 +00:00