Kuan Wang
4a6b26558d
Query usage event for a longer time period and then trim the usage
...
events outside the expected period to make sure the app usage calculation near the boundaries are correct.
Test: make RunSettingsRoboTests + manual
Bug: 264858898
Change-Id: I9f6aa5a09a537f48a26a08b7dff8ae81e8a16e2a
2023-01-13 15:17:27 +08:00
TreeHugger Robot
eac5326a16
Merge "Add toggle for Wi-Fi hotspot"
2023-01-13 06:25:47 +00:00
Milton Wu
af880ef718
Add FingerprintEnrollProgressViewModelTest
...
Bug: 259664912
Test: m RunSettingsRoboTests
ROBOTEST_FILTER=FingerprintEnrollProgressViewModelTest
Change-Id: I10605a9f179c20c3a1ba23373485855a0cbb7099
2023-01-13 11:57:59 +08:00
Jing Ji
c29bd1cdc1
Merge "Add a feature flag for the special access to the long background task"
2023-01-13 01:10:15 +00:00
Weng Su
f779e6c9d3
Add toggle for Wi-Fi hotspot
...
- Add Wi-Fi hotspot toggle with vertical divider
- Disable preference and toggle when Data Saver is enabled
Bug: 245569117
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
atest -c TetheringManagerModelTest
Change-Id: Ic2baf7d3d0a7bf9527da38d24ecc511b7c91265a
2023-01-13 08:52:54 +08:00
Ling Ma
d6b117fcdf
Add dialog for enable auto data switch
...
When user activate multi-SIM and suitable to enable auto data switch,
prompt the user when a dialog following choosing default data sub.
UX: https://docs.google.com/presentation/d/1G6bcPoJUW-YcBzpQXAQLecY3nu69rLlCLQBfpAvVD7c/edit?resourcekey=0-qPkfUNLQ2Wfz2pq3V_6MZA#slide=id.g1c25e24318e_0_0
Test: manual verified the dialog buttons following simListDialog +
specific dialog
Bug: 260659244
Change-Id: Ib35f2d08093c2dd79036034bbfe0efaaa0be3162
2023-01-12 15:24:40 -08:00
Behnam Heydarshahi
74f725254e
Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev am: cf022d4537 am: 93ae531273
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20835100
Change-Id: Ifc2e24c703199737d647f55f8615d83795630477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 17:18:05 +00:00
Behnam Heydarshahi
93ae531273
Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev am: cf022d4537
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20835100
Change-Id: Id45cee329be0245b513ad3ddd4a405fef2efb223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 16:37:26 +00:00
Behnam Heydarshahi
cf022d4537
Merge "Ring & notif vol missing on a largescreen device" into tm-qpr-dev
2023-01-12 16:15:27 +00:00
Josep del Río
98bfab5f23
Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev
2023-01-12 14:17:44 +00:00
Zaiyue Xue
9e9886997f
Merge "[Battery usage U] [UI] Show screen time in the battery detail usage page"
2023-01-12 09:18:25 +00:00
Zaiyue Xue
0639abfcca
[Battery usage U] [UI] Show screen time in the battery detail usage page
...
screen record: https://drive.google.com/file/d/1TUbcysrVoj10iUhoMIT0wuCDJY8EMpy7/view?resourcekey=0-lS9d0aIQqrgJ7CpOlsOlYw
Bug: 258125117
Fix: 258125117
Test: manual
Change-Id: I31fbc7c45473ded254ebf1b1e82e09dbc88480cf
2023-01-12 15:45:51 +08:00
Zaiyue Xue
4ecf42f1bb
[Battery usage U] [UI] Add a threshold to filter out very small battery usage items in the app list
...
Bug: 264840285
Fix: 264840285
Test: manual
Change-Id: I36a6c0dc284d09efcf82316db1541d289c37b16f
2023-01-12 15:44:26 +08:00
Bill Lin
a597789661
Merge changes from topics "disable_face_enroll_inSUW", "tuscany_FaceEnrollFoldPage" into tm-qpr-dev am: 34d144265d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20673972
Change-Id: I1b5fc399539a8f6585588c90a8481e0a8c4d5463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 07:02:24 +00:00
Milton Wu
fe819292e3
Fix face enroll introduction crash after 10mins am: 8e57808247
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454691
Change-Id: I98f9468ff878f9aefb67e29b694a52eb1b910f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-12 07:02:12 +00:00
TreeHugger Robot
6b47dd97dd
Merge "Clean up always false parameter isValidToShowSummary."
2023-01-12 06:54:32 +00:00
Bill Lin
34d144265d
Merge changes from topics "disable_face_enroll_inSUW", "tuscany_FaceEnrollFoldPage" into tm-qpr-dev
...
* changes:
3-1/ Impl FoldProvider.FoldCallback for Face enroll activities
2-1/ Add config_suw_support_face_enroll to customize SUW face enroll flow
Fix face enroll introduction crash after 10mins
2023-01-12 06:47:45 +00:00
Xin Li
5482fb0301
Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
...
Bug: 264720040
Merged-In: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
Change-Id: I2f32b289ee96a205816ed48e8f4490d081a0d315
2023-01-11 22:47:24 -08:00
Daniel Huang
aa88bca296
Merge "Integrate UI with APIs for trackpad settgins."
2023-01-12 05:33:48 +00:00
Sorin Basca
a962b4b712
NEW Use Mockito 4.6.1 API
...
Addressing skipping merge issue
Bug: 236636175
Test: atest SettingsRoboTests
Change-Id: Ie7caae0ea9aa212f1ee06d6fe89fa0776979e4e6
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2023-01-12 01:35:44 +00:00
Behnam Heydarshahi
18469d2975
Ring & notif vol missing on a largescreen device
...
Before:
"Ring & notification volume" showed up in volume panel and in volume
settings.
Now (what prompted this bugreport):
A device config was changed to mark it not voice capable.
"Ring & notification volume" disappeared from both places;
"Notification volume" showed up only in volume settings, not panel.
Fix: the voice capable should not be a factor when determining
availability for ring/notification slices.
After this fix is applied:
"Ring & notification volume" to reappear at both settings and panel.
Bug: 256548882
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="VolumePanelTest|RingVolumePreferenceControllerTest|NotificationVolumePreferenceControllerTest|SeparateRingVolumePreferenceController" RunSettingsRoboTests -j40
Change-Id: Ie2b1913bde6a64303c4d9fde3724889f949c363b
2023-01-11 22:14:29 +00:00
Joshua McCloskey
dfaa7a1b7f
Added performant auth feature am: b8695b8e76 am: 4915a5932d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20937285
Change-Id: I7427307ca99ce6512a0b66910939777193a10d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 21:49:51 +00:00
Joshua McCloskey
4915a5932d
Added performant auth feature am: b8695b8e76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20937285
Change-Id: I1214d53edf57e1b45efd3d81c7e0305d83e94459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 21:38:32 +00:00
Azhara Assanova
8327dbaeed
Make mutable implicit PendingIntents immutable
...
Starting from target SDK U, we will block creation of mutable
PendingIntents with implicit Intents because attackers can mutate the
Intent object within and launch altered behavior on behalf of victim
apps. For more details on the vulnerability, see go/pendingintent-rca.
From a quick analysis, we concluded that the PendingIntents here do not
get mutated, so we made them immutable.
Reviewers, please call out if this is not the case.
Bug: 236704164
Bug: 229362273
Test: atest MediaVolumePreferenceControllerTest
Change-Id: Ic5f701b504c0d8d0d0a44b002117ee5ef1c188f7
2023-01-11 20:44:32 +00:00
Joshua McCloskey
b8695b8e76
Added performant auth feature
...
Test: Manually verified in settings that the performant auth
feature(fingerprint) is disabled by default
Bug: 261216422
Bug: 265031172
Change-Id: I6422b12f801d038fa514758eca34efcbfdeef27a
2023-01-11 16:43:54 +00:00
TreeHugger Robot
3bc11c7ad3
Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb07 am: 02cace2f67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20874103
Change-Id: I7efaad7adeb7f07e36608dda8eb05a72133659fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 15:53:08 +00:00
TreeHugger Robot
02cace2f67
Merge "Update wallet setting availability" into tm-qpr-dev am: 61f81ffb07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20874103
Change-Id: I1c586d8d135b6238662b228b2101ab4de4d369ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 15:30:41 +00:00
Behnam Heydarshahi
53c32d487a
Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90 am: 4fc098dc1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749598
Change-Id: I2ed97051fc0602324c12960e3696c4933911abcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 15:14:24 +00:00
TreeHugger Robot
61f81ffb07
Merge "Update wallet setting availability" into tm-qpr-dev
2023-01-11 14:54:39 +00:00
danielwbhuang
6125f9a9fa
Integrate UI with APIs for trackpad settgins.
...
1. Integrate with trackpad settings dummy APIs.
2. Integrate with trackpad gesture APIs.
Bug: 247080509
Test: manual, make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.inputmethod.*"
Change-Id: Ic180e28896bb0a5aa71eb0eb63d3824bd342ff45
2023-01-11 22:42:15 +08:00
Behnam Heydarshahi
4fc098dc1b
Merge "Implement a separate controller for ring volume" into tm-qpr-dev am: ee56e95f90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20749598
Change-Id: I1dbbde115a9e92ecc1b602607827d51ec2078102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 14:34:49 +00:00
Zaiyue Xue
a500e4f739
Clean up always false parameter isValidToShowSummary.
...
So the next cl (new summary for battery detail page) doesn't need to
deal with isValidToShowSummary=true case.
Bug: 262802531
Test: presubmit
Change-Id: I88528caedb29d61a05b40d3ca435fc007bf3f54c
2023-01-11 21:03:42 +08:00
Treehugger Robot
88e923f7ce
Merge "Amend "Reset notification importance" list item style" am: aef592eb18 am: 9c8ff84746 am: 8601b70e1c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194
Change-Id: I1e2cabff29c20c9a759743116ba9d57710c3d1bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 12:17:05 +00:00
Treehugger Robot
8601b70e1c
Merge "Amend "Reset notification importance" list item style" am: aef592eb18 am: 9c8ff84746
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194
Change-Id: Ibb2373d9410439be710b78c9e61c697f87bb28b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 11:53:43 +00:00
TreeHugger Robot
569becdb7f
Merge "Use (the last existing timestamp in DB + 1) as the start time of usage event query to avoid loading the same events repeatedly."
2023-01-11 10:51:40 +00:00
Zaiyue Xue
43ace6ed33
Merge changes from topic "feature0"
...
* changes:
Refactor processBatteryDiffData() from DataProcessor to BatteryDiffData class.
Refactor PowerUsageFeatureProvider: Cache the config set to avoid generating the set again.
2023-01-11 08:57:29 +00:00
Kuan Wang
6da66f9a5c
Use (the last existing timestamp in DB + 1) as the start time of usage
...
event query to avoid loading the same events repeatedly.
queryEvents API will return the events within [start, end). In the
hourly job, if we query the events from the latest existing time, the
events happening at the latest time will be saved for multiple times
into database. This aims to avoid this issue.
Test: make RunSettingsRoboTests
Bug: 265110147
Fix: 265110147
Change-Id: I408e88b0e15fe22585906261935854cf47707f9c
2023-01-11 16:18:55 +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
Shen Lin
1721d0f276
Amend "Reset notification importance" list item style
...
Using LayoutPreference here makes list look like abrupt, we would like
to switch to normal Preference to align listitem style.
Bug: 265062898
Test: atest ImportanceResetPreferenceControllerTest -c
Change-Id: I93961de148915699d2cba46bdba71e667e8ea10a
2023-01-11 05:21:59 +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
Vania Januar
5b52104be1
Show Scribe toggle in Stylus settings only if supported by current IME.
...
This also sends the user to the Scribe settings activity if
a settings activity exists for the current IME.
Bug: 255732419
Test: StylusDevicesControllerTest
Change-Id: I955a0f5a017b247e7623d66613e09dc0f7256ff2
2023-01-10 17:44:14 +00:00
Zaiyue Xue
f080429ddb
Refactor processBatteryDiffData() from DataProcessor to BatteryDiffData class.
...
So that only hourly battery diff data needs purgeFakeAndHiddenPackages()
and combineBatteryDiffEntry(). This is also easy to set hourly threshold
in the next cl.
Bug: 264840285
Test: manual
Change-Id: Ie0bc6d53f96285285019dd83c1f39305eca79c71
2023-01-10 20:40:13 +08:00
Vania Januar
f640bb1e6d
Merge "Show None default app in stylus preference if no Notes holder."
2023-01-10 12:22:22 +00:00
Zaiyue Xue
7f3ff17bcf
Refactor PowerUsageFeatureProvider: Cache the config set to avoid generating the set again.
...
Bug: 262802531
Test: manual
Change-Id: I61b36e4e057c432d814aa104a37f0e0d552720cb
2023-01-10 19:42:09 +08: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
Bonian Chen
817786c698
Merge "[Settings] Support of Primary IMEI feature"
2023-01-10 05:39:15 +00:00
Kevin Liu
2d0ad56211
Merge "Use Mockito 4.6.1 API" into tm-dev am: 521278a00d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20838198
Change-Id: Id97ac2555495237fef8fd8c5b874db855ab7bce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-09 21:31:42 +00: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