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
TreeHugger Robot
c639d6fd91
Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341
Change-Id: I8065f98bd78eb7529427906611bccdc4c860cd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 14:42:25 +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
cb9d74cea2
Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522
Change-Id: Ia53318c8bf1dcd32af55934506a2ea0d15250e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 11:33:42 +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
07db6514d3
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916
Change-Id: I75594ae645fa1556b08f639f4f3c014d7038103b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 05:13:06 +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
Wesley Wang
cf1190c7cb
Update battery health state intent (2/3)
...
- Update the extra from overheated to longlife
Bug: 278192441
Test: make SettingsRoboTests
Change-Id: I5a906e64effbd9aaf84446c0670249afefdf7da8
2023-05-11 11:27:16 +08: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
16fc56f72c
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I580326606ec0e281f42e57dd464be5265e9bf948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 02:15:50 +00: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
Treehugger Robot
13e131f352
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf
am: d5d3d55bbd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: I1eb27aa635111eea5a31db6ac9e59cfc51ce858a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 17:25:58 +00:00
Treehugger Robot
568034bd25
Merge "Fix mistake in test" into udc-dev am: 6a06cdd1bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23118776
Change-Id: I65fb0509184b16e43f784e3ad2584f322682982f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 16:43:38 +00: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
c493c1226a
Merge "Refine optimize page log pattern" into udc-dev am: d865ccc2ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129577
Change-Id: I83b8b8374a8865ed9847021a7bb55882d8845339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 12:07:44 +00:00
Treehugger Robot
961a19c1f8
Merge "Refine optimize page log pattern" into udc-dev am: d865ccc2ed
am: 48002a9d03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129577
Change-Id: I6379666d415eec7e2daf23b517acbf2df2192214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 12:05:57 +00:00
YK Hung
9d173f318d
Merge "Remove the legacy smart battery tip from Settings" into udc-dev am: 2aff060aca
am: 40dee4b7a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129578
Change-Id: Ie4074c0ad4d8f97ef740eb11a0c4ba14aac7b2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 12:05:49 +00:00
Treehugger Robot
22b844fb59
Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev am: 7a7193c865
am: b6a07fdf0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123005
Change-Id: I4abe6da32305bad6bfd76e7afd626781b87e3cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 12:05:40 +00:00
Treehugger Robot
d865ccc2ed
Merge "Refine optimize page log pattern" into udc-dev
2023-05-10 11:38:38 +00:00
YK Hung
69d781abd4
Merge "Remove the legacy smart battery tip from Settings" into udc-dev am: 2aff060aca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23129578
Change-Id: Iddd24fef6f73ed0de5377ef0daa109fad8d59272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 11:25:36 +00:00
Treehugger Robot
8e429d756d
Merge "Hide carrier service package in Wi-Fi data usage settings" into udc-dev am: 7a7193c865
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123005
Change-Id: I5a63dc5c3e680bdfbbfcc3092e88e513be4a1cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 11:24:53 +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
Bill Lin
e5dfcc0270
Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
am: f6d23468b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802
Change-Id: I409d9db2155b71005aeec519dadac701f5e5d550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 01:09:37 +00:00
Hao Dong
bb03fc355e
Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen."
2023-05-10 00:48:15 +00:00
Bill Lin
496ad744db
Merge "Refine SkipDialog title and desc by device configs" into udc-dev am: 4d5063ffdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779802
Change-Id: I5c1e7bca3eda4ce7bbf056107dd7e7631fd82fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 00:28:40 +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
a711dc3a06
Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996
Change-Id: Iede1c8c33c9c3999952f363625687482e5980b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:59:27 +00:00
Peter Zhang
3e498ad30d
Render an additional icon to the tappable tiles with pending intents
...
Test: robotest, manual
Bug: 281517110
Change-Id: Ia5fbae63d56a6f1e6ee8fb3ee58ae912d14b6c75
2023-05-09 19:49:57 +02:00