Anna Bauza
ec91ab2bec
Merge "add settings log to user creation actions"
2022-12-06 15:25:51 +00:00
TreeHugger Robot
ccc77bf359
Merge "[Battery usage U] Show battery usage info immediately up till as close to the current moment as possible."
2022-12-06 14:56:29 +00:00
Vania Januar
33419410ea
Merge "Toggle for disabling stylus buttons."
2022-12-06 14:24:06 +00:00
Chaohui Wang
b62b890b71
Merge "Migrate AppPermissionSummaryTest to AndroidJUnit4"
2022-12-06 13:00:03 +00:00
Wesley Wang
dbd95eb47b
Merge "Fix incorrect dock defender banner icon."
2022-12-06 11:57:23 +00:00
PETER LIANG
14f145181f
Merge "Fix the preview should keep the same layer after font or display size change."
2022-12-06 09:47:59 +00:00
Zhenwei Chen
52323128dc
Fix incorrect dock defender banner icon.
...
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png
Bug: 261156455
Test: Unit tests passed and manual test on the device
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com >
2022-12-06 09:40:50 +00:00
Zaiyue Xue
3d7b8b3bfe
[Battery usage U] Show battery usage info immediately up till as close to the current moment as possible.
...
screen_record: https://drive.google.com/file/d/1Wdm8Wpn39k6E9Yo4bbTENf5VANP337QA/view?usp=share_link&resourcekey=0-1LNmaTaZI13DUmjNfkBehQ
Bug: 252407178
Fix: 252407178
Test: maunal
Change-Id: Ia08dea791bb72113719fd1316e8e9587a96eaef1
2022-12-06 17:36:55 +08:00
Bonian Chen
a1e8760494
Merge "[Settings] Code refactor - SIM slot UI preference key"
2022-12-06 08:30:50 +00:00
Betty Chang
6ef041d366
Merge "[LE Audio] Add broadcast icon when device is broadcasting but LE device is disconnected"
2022-12-06 08:03:59 +00:00
TreeHugger Robot
629f40c22b
Merge "Support App and System tabs for battery usage breakdown."
2022-12-06 07:58:09 +00:00
TreeHugger Robot
902cf1a8c4
Merge "[MTE] remove translatable=false from strings"
2022-12-06 07:22:11 +00:00
Chaohui Wang
681b519b80
Migrate AppPermissionSummaryTest to AndroidJUnit4
...
Bug: 260441791
Test: Unit test
Change-Id: I72a63f9247ae370dbfcb0ff2babbfdfc95bd60a2
2022-12-06 13:28:39 +08:00
Bonian Chen
09bd704c45
[Settings] Code refactor - SIM slot UI preference key
...
Avoid from controlling Preference key separately in different places.
Bug: 261374879
Test: local & auto
Change-Id: I0a777c3f2511a25e8f619deba964bc343183c3cc
2022-12-06 05:12:19 +00:00
Zaiyue Xue
00fb008e9c
Support App and System tabs for battery usage breakdown.
...
design_doc: go/usage-frontend-dd
screen_record: https://drive.google.com/file/d/1I8dnoMf7y9KUg0eVeqLJpHqGGOtaX6_0/view?usp=share_link&resourcekey=0-Mte0-LKN1LULRssg9t7zGg
Bug b/260786962 is also fixed in this cl.
Bug: 258123381
Bug: 260786962
Fix: 258123381
Fix: 260786962
Test: manual
Change-Id: Ifd337331d02dc10c3234c594b2e142bcd459c00f
2022-12-06 11:23:27 +08:00
Chaohui Wang
b9d4e85418
Merge "Add unit test for AllAppList"
2022-12-06 02:50:22 +00:00
Kuan Wang
ec1c9d94f2
Remove foreground_service_usage_time_in_ms field which has been merged
...
into background_usage_time_in_ms in the BatteryUsageStats (b/257392992).
Test: make RunSettingsRoboTests + manual
Bug: 258124768
Bug: 253553141
Change-Id: I0967eec0cbe6d0cb7a0535d744a1046dec1d267b
2022-12-06 01:04:48 +00:00
Ale Nijamkin
b2cce522f8
Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev am: 674bb29538
am: 092de727b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20623875
Change-Id: I31b55e7a8e83c948b1aa7d64e0f7f135f1d95698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:26:36 +00:00
Bill Yi
f5a249b75f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1c80356b98
-s ours am: e4cea181d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628220
Change-Id: Ibefea278fe6037131ea46f5aefd7234672926f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:02:41 +00:00
Bill Yi
2160cec089
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38cec4fba6
-s ours am: e5cc812e6d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628220
Change-Id: If1fe202393b3a6e1a1ecde9598c78caccb96f18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:02:39 +00:00
Bill Yi
545df22b84
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6ef73d18e1
-s ours am: 62a4b0a359
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628219
Change-Id: I6ca826872b4274e4c4711b19f2b750e43a663ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:02:35 +00:00
Bill Yi
3612124556
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aeba23203
-s ours am: 49fdb5dc4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628219
Change-Id: Ic6f269b232137665012041a426a114c89e62c7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:02:25 +00:00
Bill Yi
4830925dd9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3408280369
-s ours am: 3663fc792a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628218
Change-Id: I21448d7781fc4a6d18453c879188a763ef5032bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:02:15 +00:00
Bill Yi
c90879f696
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4076fea0ca
-s ours am: ba1266b431
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628218
Change-Id: I26363a0a3bbfd681eea1012eece8e088f0263753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:02:06 +00:00
Ale Nijamkin
092de727b9
Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev am: 674bb29538
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20623875
Change-Id: Ib2cfda862a53c9093db4b21de3c4ebbf32d33a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 20:00:02 +00:00
Ale Nijamkin
674bb29538
Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev
2022-12-05 19:38:16 +00:00
Florian Mayer
7173032477
[MTE] remove translatable=false from strings
...
No concerns were raised by Settings UX.
Bug: 258550150
Bug: 245624194
Change-Id: Ie58c97108781c94e5a0cd086acca5b21b6ea105f
2022-12-05 19:36:34 +00:00
Bill Yi
e4cea181d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1c80356b98
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628220
Change-Id: I08a087d268c1267da267161d52962de22ab574d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:06:00 +00:00
Bill Yi
e5cc812e6d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38cec4fba6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628220
Change-Id: I0e7ac80475aed3dffc036592b273e1aaf64b424d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:05:57 +00:00
Bill Yi
62a4b0a359
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6ef73d18e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628219
Change-Id: I93671bd7a40c2f11b47f6ff1a90d25df6ddf4c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:05:55 +00:00
Bill Yi
49fdb5dc4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aeba23203
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628219
Change-Id: I4dcb605d252bfa22203d675d3d11726bc1f1cb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:05:43 +00:00
Bill Yi
3663fc792a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3408280369
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628218
Change-Id: Ie507c358a3a33f75f9a46f2ffda37a6f22d861c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:05:31 +00:00
Bill Yi
ba1266b431
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4076fea0ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20628218
Change-Id: I41f2f812405ae6d63c1392662689c98f3ba31939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-05 19:05:17 +00:00
Florian Mayer
3c0a0b82da
Merge "[MTE] support force_on for device_control override"
2022-12-05 18:38:50 +00:00
Bill Yi
1c80356b98
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-12-05 18:22:29 +00:00
Bill Yi
6ef73d18e1
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-12-05 18:22:29 +00:00
Bill Yi
3408280369
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-12-05 18:22:29 +00:00
David Gutierrez
5d79ae08f6
Merge "Updated RecentLocationAccessSeeAllFragment to use a SettingsEnum value rather than a MetricsEvent value."
2022-12-05 15:58:49 +00:00
David Gutierrez
0ee3c4b0bf
Merge "Dead code removal"
2022-12-05 15:58:09 +00:00
Peter Liang
f5c7c52ca1
Fix the preview should keep the same layer after font or display size change.
...
Bug: 259213786
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingPreviewPreferenceTest
Change-Id: Ifc0047e47806662174712bb8628193bee906b384
2022-12-05 22:51:17 +08:00
Chaohui Wang
07fc7f1044
Add unit test for AllAppList
...
Bug: 260660819
Test: Unit test
Change-Id: I15e294d8b90d385e932adc3bf0d61e6923941542
2022-12-05 21:07:44 +08:00
Chaohui Wang
bda1edbb02
Merge "Clean up forked collectAsStateWithLifecycle"
2022-12-05 13:04:00 +00:00
Zhenwei Chen
7d0a7f14c3
Merge "Fix batteryInfo unit test"
2022-12-05 11:09:49 +00:00
TreeHugger Robot
4131877eec
Merge "[Settings] Add metrics log"
2022-12-05 09:24:06 +00:00
Zhenwei Chen
54615b3bec
Fix batteryInfo unit test
...
Bug:261139453
Test: Unit test passed
Change-Id: I8f94f984dc1bf833653ae49557fdd02f736b365c
Signed-off-by: Zhenwei Chen <zhenwec@google.com >
2022-12-05 09:10:39 +00:00
Bonian Chen
39b4cbbc1a
Merge "[Settings] Code refactor - apply BasePreferenceController"
2022-12-05 08:23:20 +00:00
Bonian Chen
3c9a6e294f
Merge "[Settings] Code refactor for SIM change detection"
2022-12-05 08:22:42 +00:00
changbetty
81ff62f0dd
[LE Audio] Add broadcast icon when device is broadcasting but LE device
...
is disconnected
Bug: 260173555
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: I9e8117d5c885953ab7931833de81ceab63273d43
2022-12-05 07:24:29 +00:00
Zoey Chen
11c5b96855
[Settings] Add metrics log
...
Test: manual
Bug: 260077175
Change-Id: I7d3ca64468e3fa957e79a6e1c14e49f9ef520d86
2022-12-05 06:53:55 +00:00
Chaohui Wang
2b0d5f0998
Clean up forked collectAsStateWithLifecycle
...
Use the the one from androidx.lifecycle.compose instead.
Bug: 236346018
Test: Unit test
Change-Id: Idb681ad3f2fed10fed5b9f7625511566e5b88877
2022-12-05 13:42:12 +08:00