YK Hung
8d5d69d62f
Merge "Avoid dump BatteryReattributeDatabaseHist if the feature is disabled" into main
2024-07-04 06:12:53 +00:00
Haijie Hong
5d96249d6e
Add ring indicator for battery level
...
Bug: 343317785
Test: atest AdvancedBluetoothDetailsHeaderControllerTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Ib657db60be8d377ea990674c4d2438ea8a6854d0
2024-07-04 13:26:48 +08:00
YK Hung
e15e2397af
Avoid dump BatteryReattributeDatabaseHist if the feature is disabled
...
Fix: 346706894
Fix: 350798552
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage
Flag: EXEMPT bug fix
Change-Id: I1670e2769bc71fe91a752efeea18074d53c5a017
2024-07-04 04:59:34 +00:00
Android Build Coastguard Worker
8daea1740c
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28101953'] into 24Q3-release.
...
Change-Id: I03f2802150f8c93b2f5f807bbbe740c33edb32a0
2024-07-04 03:25:27 +00:00
Steve Statia
5484c1e213
Fix to hide Display over other apps permission setting for the Scone
...
application.
Flag: EXEMPT bugfix
Bug: 349195999
Test: manually testing that the setting is removed from Adaptive
Connectivity Services advanced settings page.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2a3e96b4b52bd3d4a6971a5b3dd7b291aad094da )
Merged-In: I3f306d24040f500c7fed4f44309e9f58f5f766be
Change-Id: I3f306d24040f500c7fed4f44309e9f58f5f766be
2024-07-04 03:15:08 +00:00
Wilson Wu
2ae9ed0297
Merge "Clean up the keyboard vibration config" into main
2024-07-04 02:45:29 +00:00
Pawan Wagh
86a9e06419
Repost PageAgnostic mode notification when dismissed
...
Device is in experimental mode when using 16kB developer option.
When the notification is dimissed, repost it again.
Bug: 351029724
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Flag: EXEMPT bugfix
Change-Id: Ie579b6c4dd060b165c6cc8ae635d48e257d49bec
2024-07-03 22:00:45 +00:00
Julia Reynolds
4fd34aa386
Create a new link preference for priority modes entry
...
Test: ZenModesSummaryHelperTest
Test: manual. Successfully search for both 'event' and 'priority'
Flag: android.app.modes_ui
Bug: 341726633
Change-Id: Ib7bd1a5c2f7b06b1728a66f7a9cef53cd45acc0b
2024-07-03 16:22:20 -04:00
Julia Reynolds
6632826881
Merge "Fix IndexOutOfBoundsException" into main
2024-07-03 18:01:46 +00:00
Alina Zaidi
903976cd34
Merge "Update OWNERS for DesktopModePreferenceController" into main am: ed9bccb0b3 am: 7b4fcc6006
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3159736
Change-Id: Ibb60677d29ad574c106f95391f4572b0e142864b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 17:52:03 +00:00
Alina Zaidi
7b4fcc6006
Merge "Update OWNERS for DesktopModePreferenceController" into main am: ed9bccb0b3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3159736
Change-Id: I79c2dd015ce63fa0fe658daf486971f48917f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 17:37:22 +00:00
Alina Zaidi
ed9bccb0b3
Merge "Update OWNERS for DesktopModePreferenceController" into main
2024-07-03 16:42:23 +00:00
Alina Zaidi
a059eabdb3
Update OWNERS for DesktopModePreferenceController
...
Change-Id: I446525a06480a27f80e530c65181fd31f43a9ef8
Test: N/A
Flag: EXEMPT Ownership cannot be flagged
2024-07-03 16:22:23 +00:00
Pawan Wagh
e1a69960f9
Merge "Fix flaky test for persistent notifications" into main am: b6fc7a6f58 am: fdd68f473b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3156445
Change-Id: I0635a73774b0db08c401ef2523b2da13b0b359f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 15:47:26 +00:00
Pawan Wagh
fdd68f473b
Merge "Fix flaky test for persistent notifications" into main am: b6fc7a6f58
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3156445
Change-Id: I0c2f3c0445e06e63a26cc69efa326c8ccabf0e66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 15:36:52 +00:00
Pawan Wagh
b6fc7a6f58
Merge "Fix flaky test for persistent notifications" into main
2024-07-03 15:14:25 +00:00
Yuri Lin
900412914f
Merge "Right-align "end time" portion of the schedule setter." into main
2024-07-03 15:07:09 +00:00
Julia Reynolds
bb10c9f4df
Fix IndexOutOfBoundsException
...
Test: none, MonkeyComboTest_StabilityMonkey
Fixes: 341614935
Flag: EXEMPT bugfix
Change-Id: Id52bcbc40145d7dca477425322e317abc2268a59
2024-07-03 09:32:59 -04:00
Rubin Xu
935cea2ca7
Gray out admin-disabled screenlock option properly
...
Fix an issue where some sceenlock options are disabled
by admins but not showing up as grayed out.
Bug: 288081292
Flag: EXEMPT bug fix
Test: manually with `am start -a android.app.action.SET_NEW_PASSWORD
--ez isSetupFlow true --ei android.app.extra.PASSWORD_COMPLEXITY 327680`
Change-Id: I4aab61a052bc2c5146f44d0bfcd8153e3f2cee92
2024-07-03 10:55:47 +00:00
SongFerng Wang
9ff81e6b3a
[automerger skipped] Merge "Fix AppBatteryPreferenceTest flaky" into main am: 5462789fae -s ours am: 7423e21ba3 -s ours
...
am skip reason: Merged-In I5a1753835d2d47712ea249081c9a77c455eb3291 with SHA-1 23c66d1278 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3077806
Change-Id: Ied279905ec1a6595f12660660cdca09c1bf3b2a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 10:08:42 +00:00
Chaohui Wang
69b1c7c99a
[automerger skipped] Fix AppBatteryPreferenceTest flaky am: 6a6a263177 -s ours am: 362df0c72b -s ours
...
am skip reason: Merged-In I5a1753835d2d47712ea249081c9a77c455eb3291 with SHA-1 23c66d1278 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3077806
Change-Id: I03f98e2cd44550bdcd303de8bca8efccfab648bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 10:08:36 +00:00
SongFerng Wang
7423e21ba3
[automerger skipped] Merge "Fix AppBatteryPreferenceTest flaky" into main am: 5462789fae -s ours
...
am skip reason: Merged-In I5a1753835d2d47712ea249081c9a77c455eb3291 with SHA-1 23c66d1278 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3077806
Change-Id: I801504ca58905818b24c761bd4b331cac195857f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 09:47:55 +00:00
Chaohui Wang
362df0c72b
[automerger skipped] Fix AppBatteryPreferenceTest flaky am: 6a6a263177 -s ours
...
am skip reason: Merged-In I5a1753835d2d47712ea249081c9a77c455eb3291 with SHA-1 23c66d1278 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3077806
Change-Id: Icc52784d754185fad53557d964344f267940d8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 09:47:50 +00:00
SongFerng Wang
5462789fae
Merge "Fix AppBatteryPreferenceTest flaky" into main
2024-07-03 09:34:52 +00:00
Fan Wu
6f6d3e7263
Merge "Remove Use on-screen keyboard preference from Physical Keyboard page" into main
2024-07-03 09:27:44 +00:00
SongFerng Wang
6213cb9aa9
Merge "Fix UI flashing after changing network mode" into main
2024-07-03 08:10:12 +00:00
Fan Wu
ec5df5cd1e
Remove Use on-screen keyboard preference from Physical Keyboard page
...
Bug: 304460009
Flag: EXEMPT removing preference from xml
Test: on device
Change-Id: Ibb0517c5ffa4addb52f1b0469f30c5126bd5828a
2024-07-03 06:29:54 +00:00
Tiger Huang
362a5f9450
Merge "Fix certificate manager UI (take 2)" into main
2024-07-03 06:23:53 +00:00
Jayant Chowdhary
8569d2ade0
Merge "Exclude webcam and MIDI USB preferences from requiring auth challenge" into main
2024-07-03 04:55:58 +00:00
Treehugger Robot
bee9ccf37b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 8f3e07f4a1 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28137703
Change-Id: Ieec5be91dc84ed02e9d3e3ee0c5f9c4299eadcd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:19:34 +00:00
Bill Yi
dfc13dc331
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 374b49a643 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28137703
Change-Id: I429303bd859a00c40a3438275b138022ec0ebf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:19:28 +00:00
Treehugger Robot
c3630d9830
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: acb60976c5 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28137699
Change-Id: I70d0ac690e32e8eaf201e0bb9a92f0246cb14bcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:19:19 +00:00
Bill Yi
029bf91c40
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f794e6c05 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28137699
Change-Id: I1e62202ea93e002678cda56e12fa77caecd6dc40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:19:13 +00:00
Treehugger Robot
276c2434b1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 7ddc3feba8 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28135102
Change-Id: Ia66aa2f006417e2c0e97e391c60414534d0ee814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:19:06 +00:00
Bill Yi
88acc423f1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c4245015f -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28135102
Change-Id: If8bc1a24d119fd5b8aaefa36d71ee047ca3786c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:18:56 +00:00
Treehugger Robot
e9c3f3c950
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: ed84843965 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28135100
Change-Id: I0c367f735bed2e33d427eb829d3c1b37d50d880b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:18:16 +00:00
Bill Yi
c994e52112
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adb91863c4 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28135100
Change-Id: Ie19902fb44123c76331db3b0c0a19232fa91a075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:18:08 +00:00
Bill Yi
548ccfa180
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d141c167f0 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28137698
Change-Id: Iaff5dd856bb24399bade74e4808069b1cba99702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 03:17:27 +00:00
Treehugger Robot
8f3e07f4a1
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-03 02:54:11 +00:00
Treehugger Robot
acb60976c5
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-03 02:54:11 +00:00
Treehugger Robot
7ddc3feba8
Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
2024-07-03 02:54:11 +00:00
Treehugger Robot
ed84843965
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-07-03 02:53:31 +00:00
Treehugger Robot
d026d3fcc7
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-03 02:45:38 +00:00
Treehugger Robot
e91cfca1c2
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-03 02:45:38 +00:00
Treehugger Robot
22fc05176a
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-07-03 02:45:38 +00:00
Treehugger Robot
a56866ddaa
Merge "Add mandatory biometric prompt to platform surfaces (2/N)" into main
2024-07-03 02:39:11 +00:00
David Lin
3ba119a90c
[automerger skipped] Merge "Fix to hide Display over other apps permission setting for the Scone application." into 24D1-dev am: d0d083621b -s ours
...
am skip reason: Merged-In I3f306d24040f500c7fed4f44309e9f58f5f766be with SHA-1 2a3e96b4b5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28058913
Change-Id: Id193c73738fc52deccac5489f7b36ef04c27dc94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 00:57:38 +00:00
Steve Statia
b7c152e85d
[automerger skipped] Fix to hide Display over other apps permission setting for the Scone am: 74670e4923 -s ours
...
am skip reason: Merged-In I3f306d24040f500c7fed4f44309e9f58f5f766be with SHA-1 2a3e96b4b5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28058913
Change-Id: Ic597b4f0b61c739496b279cf03b61e2a20cd1eeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 00:57:32 +00:00
David Lin
d0d083621b
Merge "Fix to hide Display over other apps permission setting for the Scone application." into 24D1-dev
2024-07-03 00:53:42 +00:00
songferngwang
f6da87c4b2
Fix MobileNetworkSettings kotlin.UninitializedPropertyAccessException am: 083fda3673
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28136379
Change-Id: Iee51185b9b81a70e3fd4cd7767e1513bb9f69b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-03 00:52:00 +00:00