TreeHugger Robot
24dbaeba1e
Merge "Clean up unused code in AdvancedPowerUsageDetail class"
2023-01-11 08:54:30 +00:00
Zaiyue Xue
cad4c069bd
Clean up unused code in AdvancedPowerUsageDetail class
...
Bug: 262802531
Test: presubmit
Change-Id: Ide91bd5312296945effb5a54422bda2c9623341d
2023-01-11 14:27:53 +08:00
TreeHugger Robot
89e5b837b9
Merge "Adjust background time to avoid background + screen time larger than time slot duration."
2023-01-11 05:54:55 +00:00
TreeHugger Robot
353cde7109
Merge changes from topic "LifecycleEffect"
...
* changes:
Redirect to AppInfoSettings when SPA is on
Reload package info for each time enter App Info
2023-01-11 05:35:07 +00:00
Zaiyue Xue
0ddc5257f5
Merge "[Battery usage U] [UI] Update the text in footer"
2023-01-11 05:34:41 +00:00
Edgar Wang
47fbf1d333
Merge "Set key for the SwitchPreferences of Connected devices > USB"
2023-01-11 04:07:05 +00:00
Kuan Wang
a396885f5e
Adjust background time to avoid background + screen time larger than
...
time slot duration.
Test: make RunSettingsRoboTests
Bug: 265089855
Fix: 265089855
Change-Id: Idf3fee13eccd5b1f699feb5f79bd2aa474e444b8
2023-01-11 11:44:36 +08:00
Andy Hung
11264e9a00
Merge "Bluetooth Settings: Restore Spatial Audio Settings"
2023-01-11 03:29:14 +00:00
Zaiyue Xue
4221504e43
[Battery usage U] [UI] Update the text in footer
...
Bug: 265088249
Fix: 265088249
Test: manual
Change-Id: If112f7a0b3509cdf11f1ffcea233ab3ace2bf6d7
2023-01-11 11:10:54 +08:00
TreeHugger Robot
47aed3060e
Merge "Add "Data Sharing Updates" to legacy Privacy Page"
2023-01-11 02:26:04 +00:00
Arc Wang
c8c1cfda38
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946 -s ours am: cef3637f4c -s ours am: b169c48705 -s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213
Change-Id: I4d641efd90bd9cd83d00616e4f9b19a1bc7b17c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 01:23:21 +00:00
Arc Wang
2d9b281595
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d -s ours am: e3a8b88137 -s ours am: a9f470ab46 -s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601
Change-Id: I73ecabcc25847fa4309ffc50f37ae35097233ede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 01:23:19 +00:00
Arc Wang
6d0def1b87
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281 am: b7c98a18c9 -s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 17cd85b946 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727211
Change-Id: I32243ee3ef1647611ff2f3928d6e9e639c0e67ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 01:23:10 +00:00
Arc Wang
5175b552f3
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 4703a5a61b -s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 960c96474d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20758917
Change-Id: I1302e4a55552420f36996bca2b142631da310455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 01:22:59 +00:00
Bill Yi
cce02ab84a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76b6947b01 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20738954
Change-Id: I2feed138828f25a29f54c570cabd7bfc792c2a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 01:21:24 +00:00
TreeHugger Robot
6eedc1cdfe
Merge "Update string" into tm-qpr-dev am: 8dc66bc482 am: 26f47177a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20925429
Change-Id: I08496788be3e791658c54564e59f0e462ca9669e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-10 20:57:52 +00:00
TreeHugger Robot
26f47177a3
Merge "Update string" into tm-qpr-dev am: 8dc66bc482
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20925429
Change-Id: I484277c3466ccc0a48f276e3bd0b933ab6be34d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-10 20:00:50 +00:00
TreeHugger Robot
8dc66bc482
Merge "Update string" into tm-qpr-dev
2023-01-10 19:28:16 +00:00
Hao Dong
22fc2f387b
Merge "Add a flag for moving UdfpsEnroll* from SystemUI to settings."
2023-01-10 18:02:42 +00:00
Lucas Silva
59537681bc
Only show communal settings to the primary user am: e33639f117 am: 600741c78c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20859979
Change-Id: I8562766dd513521b8f3dcf3519f0ee74cd3a052d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-10 17:55:47 +00:00
Lucas Silva
600741c78c
Only show communal settings to the primary user am: e33639f117
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20859979
Change-Id: Ia66b6011f37412bbbdf783b3d5f844446f4fc1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-10 17:22:02 +00:00
Amy Hsu
7e36e664b6
Merge "[RRS] show resolution option on Settings page."
2023-01-10 16:47:56 +00:00
Julia Reynolds
fc63046f32
Update string
...
Test: view string in UI
Fixes: 262094151
Change-Id: I4f55c340d3144d446465d64008d9d92d622425ae
2023-01-10 16:23:57 +00:00
Chaohui Wang
910de9454f
Merge "Update for AppOpsController changes"
2023-01-10 15:42:43 +00:00
Vania Januar
f640bb1e6d
Merge "Show None default app in stylus preference if no Notes holder."
2023-01-10 12:22:22 +00:00
Tom Hsu
5fc863fc01
Merge "Expose the regional preferences page"
2023-01-10 09:17:30 +00:00
Kuan Wang
72baf601fd
Merge "Add logging for total screen-on time and foreground usage time."
2023-01-10 09:12:40 +00:00
Jason Hsu
e0301f7aa4
Merge "[hearing devices page] Launch 'Hearing decice controls' to Accessibility hearing device page."
2023-01-10 09:05:55 +00:00
Amy Hsu
0d9e5d600c
[RRS] show resolution option on Settings page.
...
Due to the special width/ height of the device, we have to modify the
available condition otherwise the resolution option cannot be shown on Settings.
Bug: 258346214
Test: Lunch Settings and check the Display page
Change-Id: I577e0e1227727aab75787c1f6115091e0c6158e1
2023-01-10 07:41:43 +00:00
Chaohui Wang
12b2f7cbe9
Update for AppOpsController changes
...
Bug: 235727273
Test: Manually with Settings
Change-Id: Ic4f4d6354b471500ee727e513ff161f0ee1e3225
2023-01-10 15:33:55 +08:00
Kuan Wang
a708592e0a
Add logging for total screen-on time and foreground usage time.
...
Test: manual
Bug: 260965322
Change-Id: Ia1711fb73a6390e6a91289331daf3d88675731fe
2023-01-10 14:36:01 +08:00
Bonian Chen
817786c698
Merge "[Settings] Support of Primary IMEI feature"
2023-01-10 05:39:15 +00:00
tom hsu
c03ff3b870
Expose the regional preferences page
...
- Settings -> language & input -> Regional preferences
Bug: b/246929960
Test: atest pass.
Change-Id: I650111147a95a09b3b52518e6369ede0a4275857
2023-01-10 13:11:08 +08:00
Milton Wu
dc8f967315
Merge "Refactor FingerprintEnrollFindSensor"
2023-01-10 02:44:35 +00:00
Nate Myren
027d64c84c
Add "Data Sharing Updates" to legacy Privacy Page
...
Note: Strings are non-final
Test: manual
Fixes: 261663929
Change-Id: Ia036a3bf715d10f94f17faf5b571896ca229a39a
2023-01-09 16:47:35 -08:00
TreeHugger Robot
7bc6dd9609
Merge "Exported A11y features blocked by IT admin can be bypassed using a11y shortcuts"
2023-01-10 00:40:48 +00:00
Milton Wu
3be7385d90
Refactor FingerprintEnrollFindSensor
...
Refactor FingerprintEnrollFindSensor to 3 pages for different sensor
types, and apply MVVM for them.
Bug: 259664912
Bug: 260957195
Bug: 260957816
Test: atest FingerprintRepositoryTest FingerprintEnrollmentActivityTest
AutoCredentialViewModelTest FingerprintEnrollIntroViewModelTest
Change-Id: Iace790952567cac13e61e5175e90555d4da7dfe2
2023-01-10 07:52:37 +08:00
TreeHugger Robot
25e8018d78
Merge "Fix settings bug (pt 2)"
2023-01-09 22:25:22 +00:00
Menghan Li
526ababc60
Merge "Dynamic update a11y settings when a11y service target is disabled"
2023-01-09 22:06:26 +00:00
Tom Hsu
8e631a1905
Merge "[Regional preferences] Add numbering system page."
2023-01-09 17:25:10 +00:00
Victor Truong
9246bceb5d
Merge "Change screensaver option to be available to MainUser."
2023-01-09 17:22:25 +00:00
Bill Yi
87ee0400a8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f8b28eaf4 -s ours am: 754110751c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20907730
Change-Id: I8f588246e1d5966ab207c4749ab4ee23bce78f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-09 15:49:31 +00:00
Lucas Silva
e33639f117
Only show communal settings to the primary user
...
Fixes: 264284347
Test: flashed device, and verified settings don't appear for secondary
user. Setting still appears for primary user
Test: atest CommunalPreferenceControllerTest
Change-Id: I6686ce4dbc7d708a93131620ae93c5e0dc323995
2023-01-09 15:15:27 +00:00
Bill Yi
754110751c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f8b28eaf4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20907730
Change-Id: I9b35a6c8266325bd03509096103cdc9228a9735f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-09 15:09:58 +00:00
tom hsu
6461d16c59
[Regional preferences] Add numbering system page.
...
- Add language selection page
- Add number format page
- Refactor some part for readability.
Bug: b/247073388
Bug: b/246929960
Test: atest pass
Change-Id: I617698a3146b6e461467a97de8c08f4c4dc6e7f2
2023-01-09 22:54:57 +08:00
TreeHugger Robot
1b4428ea3d
Merge "[Battery usage U] [UI] Show screen time in the battery usage app list items"
2023-01-09 11:33:10 +00:00
TreeHugger Robot
95b9ca6573
Merge "Revert "Fix the inverted logic to judge whether an app is system app.""
2023-01-09 09:39:02 +00:00
Zaiyue Xue
48a1dacc39
[Battery usage U] [UI] Show screen time in the battery usage app list items
...
https://drive.google.com/file/d/1N2yrra6cga6CRIXzxTGhctcxwN47lE89/view?resourcekey=0-qlw1a78Ph-gSfXFAHKoumQ
https://drive.google.com/file/d/1joSI3YL8dn0rRW1Ywyte7MUy_CTDFS2p/view?resourcekey=0-VsgaqSi2YUfn6ImZEOBH-g
Bug: 258120710
Test: manual
Change-Id: Id22d2490d0bffeb8b7d2e0941bcdb4e3d352e966
2023-01-09 17:26:56 +08:00
Arc Wang
1aaba85238
Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property"
2023-01-09 09:24:57 +00:00
Zaiyue Xue
9a35838436
Revert "Fix the inverted logic to judge whether an app is system app."
...
This reverts commit 814eff1c24 .
Reason for revert: The original logic is right.
Change-Id: I2aee0f9ab13c60d843e91056de9d409a1d84b9d4
2023-01-09 07:30:35 +00:00