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
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
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
YK Hung
6d50c00a2b
Merge "Remove the legacy smart battery tip from Settings" into udc-dev am: 2aff060aca
am: 40dee4b7a9
am: 9d173f318d
am: ede7353183
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129578
Change-Id: I2299f38e4342891ab589c4011078719f7d8351df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:40:26 +00:00
Treehugger Robot
d275317781
Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev am: 7a7193c865
am: b6a07fdf0b
am: 22b844fb59
am: 0516f5480c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123005
Change-Id: I400c3891de86550d36d85011455e3e5a68c07b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:40:17 +00:00
tom hsu
0617631408
[Settings] Avoid NPE if BT device is changed by framework.
...
- Do not register only one BT device for primary to avoid primary
BT devcie change to another.
- Register and unregister all BT devices
Bug: 280236099
Test: atest passed
Change-Id: I610144c7f8f649e40d99cf1dc7f50d1f3b80f109
2023-05-11 02:53:19 +08:00
Bill Lin
4caa3ece94
[conflict] Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
am: f6d23468b1
am: e5dfcc0270
am: 547f6d63a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802
Change-Id: I61fed7e932c8dc476b689ca61bbf8ee919924bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 16:29:52 +00:00
Treehugger Robot
6a06cdd1bf
Merge "Fix mistake in test" into udc-dev
2023-05-10 15:59:23 +00:00
Treehugger Robot
d865ccc2ed
Merge "Refine optimize page log pattern" into udc-dev
2023-05-10 11:38:38 +00:00
YK Hung
2aff060aca
Merge "Remove the legacy smart battery tip from Settings" into udc-dev
2023-05-10 11:19:28 +00:00
Treehugger Robot
7a7193c865
Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev
2023-05-10 10:59:27 +00:00
Wesley Wang
1f78ebd8aa
Refine optimize page log pattern
...
- Add timestamp and prefix string
- Chagne Action.MANUAL to LEAVE for better readability
screenshot: https://screenshot.googleplex.com/ALTvMaPWVEq8y7c.png
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I69d1beceb98444d823f6ffc3a015cf61a7d7a66d
2023-05-10 10:11:28 +00:00
ykhung
2f42eb20f3
Remove the legacy smart battery tip from Settings
...
Remove the legacy smart battery tip from the battery settings, which
will remind users to eanble the "adaptive battery" if users disable it.
Reasons: 1) 98% users will always keep the AB is enabled, and 2) we move
the AB into the battery saver page, there is no individual page anymore
Fix: 281798483
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.batterytip.*
Change-Id: I85739b88ee9373b95a62271d2eb0137cf411d8cb
2023-05-10 09:48:55 +00:00
Weng Su
f65c4530e4
Hide carrier service package in Wi-Fi data usage settings
...
- When there is no specified SubscriptionInfo, Wi-Fi data usage will be displayed. In this case, the carrier service package also needs to be hidden.
- Fix failing test cases in DataUsageListTest
Bug: 273167633
Bug: 280021214
Test: manual test
Change-Id: I66ff8a28d9e7f7db77c8a210cb36676a07fc2c7d
2023-05-10 17:30:01 +08:00
Hao Dong
bb03fc355e
Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen."
2023-05-10 00:48:15 +00:00
Bill Lin
4d5063ffdc
Merge "Refine SkipDialog title and desc by device configs" into udc-dev
2023-05-09 23:09:38 +00:00
Hao Dong
968c5fb6f0
Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen.
...
Bug: 279823572
Test: atest FingerprintSettingsFragmentTest
Test: atest ChooseLockGenericTest
Change-Id: Ie4bc18bf245eb7a755862401c710d85381063ff9
2023-05-09 21:32:44 +00:00
Florian Mayer
8512191c33
Fix mistake in test
...
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=DevelopmentMemtagPageTest
Bug: 280021647
Change-Id: I74aa8764933d2abe9ae9dfd47c9f010411a3efee
2023-05-09 12:25:20 -07:00
Derek Jedral
cb9ddfe658
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
am: 1f01e15499
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: I8c7ad9ce82f2418932672ff591b5de108340aa91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 18:42:26 +00:00
Derek Jedral
9c67ee1eb1
Merge "Remove feature flag for active unlock" into udc-dev
2023-05-09 17:17:11 +00:00
Angela Wang
53a8cc0326
Disabled state UI of Flash Notifications preview button
...
When both the camera flash and screen flash toggles are turned off, tapping on the preview button will have no effect and may confuse users. To avoid this, the appearance of the preview button should be updated to clearly indicated that its current state is disabled. This wil help users better understand the situation and prevent confusion.
Bug: 276494146
Test: checks the UI manually
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreviewPreferenceTest
Change-Id: I55b11188fde6e551921a9b0f7c89daa20a8b766b
2023-05-09 16:48:35 +00:00
Vincent Wang
7f21ad81f7
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f
am: 81740a7c0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022
Change-Id: I08589651a8ba8924419b17cba205c0cc3408f6c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:14:14 +00:00
TreeHugger Robot
fa0e390fbe
Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a
am: 914ed31fe3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572
Change-Id: Ice2f958de203a738a534155e41694a68870e4649
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 11:12:00 +00:00
lbill
67d6dff7cc
Refine SkipDialog title and desc by device configs
...
1. Wrap isFaceSupportedInSUW() in Settings Utils
2. Wrap getCombinedScreenLockOptions in Settings Utils
3. Add EXTRA_KEY_FOR_SUW to judge if in SUW flow
4. Refactor SetupSkipDialog by hasFace, hasFingerprint,
isSuw, isFaceSupported conditions
5. Clean up the mapping logic of SetupSkipDialog
6. Replace bools with @LockPatternUtils.CredentialType
7. Refine the logic for isFaceSupported
---------------------------------------
Config |SuwSupportFace|!SuwSupportFace|
isSuw | true | false |
!isSuw | hasFace | hasFace |
Bug: 263070591
Bug: 279389803
Bug: 279195215
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Test: SUW(workprofile), post-SUW
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.password
Test: m RunSettingsRoboTests ROBOTEST_FILTER=SetupSkipDialogTest
Change-Id: Ie7af4299695dc3983b4190929b4dd659c301c082
2023-05-09 09:55:52 +00:00
Vincent Wang
5801e98d7f
Merge "Test Fix SettingRobolectricTest Fail" into udc-dev
2023-05-09 09:50:50 +00:00
Vincent Wang
818f77cd1f
Test Fix SettingRobolectricTest Fail
...
Bug: b/275023433
Test: NA
Change-Id: If2dcb8f6c196327129ccc9375b190e394c994efa
2023-05-09 06:26:39 +00:00
Sunny Shao
aeb42d1438
Fix the UI in the left side & right side inconsistent problem
...
- Let the homepage show "Network & Internet" item in demo mode on large screen device.
Fixes: 276157240
Test: atest TopLevelNetworkEntryPreferenceControllerTest
Change-Id: Ife8bce28e6bc47caf3f06b1027579ea0e52172a3
2023-05-09 09:39:36 +08:00