TreeHugger Robot
b47e7b4248
Merge "Update all preferences when the account preference updates UI" into tm-qpr-dev am: 6e14ff02e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19192851
Change-Id: I832dcbc2fa78a81f9d64169d80cdc5a9aed5df4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 02:48:33 +00:00
TreeHugger Robot
6e14ff02e8
Merge "Update all preferences when the account preference updates UI" into tm-qpr-dev
2022-07-20 02:22:44 +00:00
TreeHugger Robot
3d6b632232
Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev am: bd41fe5a5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19207636
Change-Id: I8ea19a4c48286a2185450116f06a3314087c5be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 17:21:39 +00:00
TreeHugger Robot
bd41fe5a5b
Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev
2022-07-19 17:02:10 +00:00
Jason Chiu
c89755525f
Update all preferences when the account preference updates UI
...
When an account is added or removed, the account preference controller
just updates the account list, whereas there's no trigger point for the
account data sync preferences to refresh.
Add an API to update all preferences in DashboardFragment, so we can
refresh the account sync preferences whenever the account list is
updated.
Bug: 185479221
Test: robotest, manual
Change-Id: Ide3d972abae09ce0175e3bafbb1f4a5e307d20c8
2022-07-19 10:32:23 +00:00
wesleycwwang
97b5163651
Add dock charging state into stay awake feature (1/2)
...
Bug: 233704731
Test: make RunSettingsRoboTests
Change-Id: I48e5279f24f7252c6bf7433a598df796942ed756
2022-07-19 08:19:26 +00:00
Treehugger Robot
3ce3686836
Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d am: dad4720a31 am: cb4de95600
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780
Change-Id: I1bf71a120f7db3f388a5e279a7e13ece80eef571
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 01:06:43 +00:00
Treehugger Robot
cb4de95600
Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d am: dad4720a31
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780
Change-Id: Ia8f4762a938a8b4dc2b8ac503b42792cc3cd882a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-18 20:43:47 +00:00
Simon Wingrove
ef498ef53d
Distinguish multiple PendingIntents via requestCode am: 25686219d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19289844
Change-Id: Id8509feac060578cf8d7ffb4d7a7b9def221f029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-18 19:19:15 +00:00
Simon Wingrove
25686219d3
Distinguish multiple PendingIntents via requestCode
...
Settings uses a system of intent extras to open subsettings pages. When
PendingIntents are created from these Intents, the system does not think
they are unique as extras are not included in this equality check. So
only one of them is likely to work.
A unique request code can be used to distinguish between them.
Bug: 238605613
Test: atest LockScreenSafetySourceTest
Merged-In: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
Change-Id: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
(cherry picked from commit f2b0cedcd0 )
2022-07-18 11:18:28 +00:00
Treehugger Robot
dad4720a31
Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780
Change-Id: Iaa69c78ca9535382935688f7d9b41724c3f179ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-16 03:21:01 +00:00
Treehugger Robot
2a0a88af4d
Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780
Change-Id: I6ba5b7c40e87df6c231e0c774913b1320c9c3996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-16 02:51:11 +00:00
Treehugger Robot
e705fcd7c3
Merge "Fix incorrect storage calculation when SD card is inserted"
2022-07-16 02:35:19 +00:00
TreeHugger Robot
3928fcabab
Merge "Save isCanceled state and restore when rotation" into tm-qpr-dev am: 3028e52501
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267966
Change-Id: I6072236085c1feec6588d8b06931517086f32d48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 05:21:45 +00:00
TreeHugger Robot
3028e52501
Merge "Save isCanceled state and restore when rotation" into tm-qpr-dev
2022-07-15 05:03:40 +00:00
TreeHugger Robot
14f791bf73
Merge "Run lock before fingerprint enroll" into tm-qpr-dev am: e49a84480b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19260206
Change-Id: I72fbe236492e87c7b6d23c0de36c8dd307f035e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 00:43:02 +00:00
TreeHugger Robot
e49a84480b
Merge "Run lock before fingerprint enroll" into tm-qpr-dev
2022-07-15 00:37:04 +00:00
TreeHugger Robot
f14704504b
Merge "Check portal on fingerprint intro page" into tm-qpr-dev am: 9fcf073bab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267972
Change-Id: I738b4d76e633f359cdaedc4fee43f0975c60e7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 00:33:48 +00:00
lbill
d7f53d4180
Save isCanceled state and restore when rotation
...
- Create mIsCanceled field in FingerprintEnrollEnrolling
- Override onSaveInstanceState and save mIsCanceled state
- onCreate restore mIsCanceled
- shouldStartAutomatically() return mRestoring && !mIsCanceled
- Integrate FingerprintErrorDialog with "try again"-> Clear mIsCanceled
Bug: 237103873
Test: manual enroll UDFPS, and wait for timeout, seeing timeout error
dialog showing above fingerprint enrollment pad.
Change-Id: I3a3010ca12aa0b23fd122a8afc9b82adf5656fb8
2022-07-15 08:14:53 +08:00
TreeHugger Robot
9fcf073bab
Merge "Check portal on fingerprint intro page" into tm-qpr-dev
2022-07-15 00:08:59 +00:00
Nate Myren
b055df3b8c
Remove location toggle from privacy controls screen am: d18f11a84f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19281813
Change-Id: I7b2286f4cfbb022ea6cdfffa9ef1b42da6a05062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-14 20:52:30 +00:00
Milton Wu
504a659ba5
Run lock before fingerprint enroll
...
Run setOrConfirmCredentialsNow() before enrolling fingerprint for
fingerprint-only device.
Bug: 237433373
Test: atest BiometricEnrollActivityTest
Test: Manually test SUW flows for fingerprint-only device
1. check confirm pin case
2. check choose pin case
3. enable always_finish_activities, check confirm pin case
4. enable always_finish_activities, check choose pin case
Change-Id: I68da429145835fc79f83f3292749088dc25fdeee
2022-07-14 08:40:45 +00:00
Milton Wu
bd966754ce
Check portal on fingerprint intro page
...
Check SUW portal flag on Fingerprint introduction page. Do not use
suw_max_fingerprints_enrollable as fingerprint count if portal flag is
enable.
Bug: 235655422
Test: m RunSettingsRoboTests \
ROBOTEST_FILTER=FingerprintEnrollIntroductionTest
Test: Manually test "Add another finger" on Deferred and Portal
suggested actions page
Change-Id: I2789d95fb214b5da6d8d03ef77583d064652e69e
2022-07-14 05:28:46 +00:00
Nate Myren
d18f11a84f
Remove location toggle from privacy controls screen
...
Bug: 238857896
Test: manual
Change-Id: Ifc4ccc13271c42a0dd1941e8f26842afbe0411d6
2022-07-13 11:31:16 -07:00
Grace Cheng
b04079323c
Merge "Update SFPS Enrollment to have error messages replace title" into tm-qpr-dev am: e287bbe82b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19264894
Change-Id: Ie4c31048df6afc3dcb115abebdabe100ffd12fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 17:26:17 +00:00
SongFerng Wang
b59e099ce6
Merge "[WFC] The WFC UI did not refresh after the subscriptionInfoChanged" into tm-qpr-dev am: dc6f2df00e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19222900
Change-Id: Id4d3e4fe19aa697fb465d5d572cbb3ed7cf6be41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-13 17:26:05 +00:00
Grace Cheng
e287bbe82b
Merge "Update SFPS Enrollment to have error messages replace title" into tm-qpr-dev
2022-07-13 17:21:16 +00:00
SongFerng Wang
dc6f2df00e
Merge "[WFC] The WFC UI did not refresh after the subscriptionInfoChanged" into tm-qpr-dev
2022-07-13 17:15:12 +00:00
Grace Cheng
dc82b6364e
Update SFPS Enrollment to have error messages replace title
...
Update SFPS Enrollment to have error messages replace title rather than showing error messages underneath the fingerprint animation
Fixes: 234135107
Test: Enroll finger and see error messages replace title
Change-Id: I106a0147bf69d8dfab99d58e9e309cfb32c650fa
2022-07-12 22:57:17 +00:00
TreeHugger Robot
005876ae80
Merge "Add function getBatteryHistorySinceLastFullCharge, used to replace getBatteryHistory in BatteryHistoryLoader." into tm-qpr-dev am: 51d087cd67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235232
Change-Id: Ic7576a9592b3b9ef71af52001c02f0db17a41312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 16:56:03 +00:00
TreeHugger Robot
a51b1baeaa
Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev am: fedab69c9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235726
Change-Id: I2d241c16e537f0131a95f70528dd47c75791f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 16:54:06 +00:00
TreeHugger Robot
51d087cd67
Merge "Add function getBatteryHistorySinceLastFullCharge, used to replace getBatteryHistory in BatteryHistoryLoader." into tm-qpr-dev
2022-07-12 16:47:13 +00:00
TreeHugger Robot
fedab69c9a
Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev
2022-07-12 16:40:32 +00:00
SongFerngWang
d9bc33e3b5
[WFC] The WFC UI did not refresh after the subscriptionInfoChanged
...
Add the listener for subscriptionInfoChanged and update the Visible
of the category.
Bug: 233783112
Test: atest NetworkProviderWifiCallingGroupTest
Change-Id: I7698915abb2f3b0ba2b40d8e78fe4e3302756c91
2022-07-12 14:58:50 +08:00
Amy Hsu
a067fba01f
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: f51951c9d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: If81fa8f115b89eb458b02736276940d8148458e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:47:15 +00:00
Amy Hsu
ef540c685d
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: I7f6bf6ad05de82ad77ced5bd776c3602f4057290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:15:31 +00:00
Amy Hsu
f51951c9d3
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855
Change-Id: Ie9b806a127e7eced1b9d790beb874e712e452de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 04:15:21 +00:00
Amy Hsu
1f7fab03c8
Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev
2022-07-12 03:54:27 +00:00
Hugh Chen
e88be4859c
RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings am: f5166f46e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589
Change-Id: Ida6c1387588887b78f33de9f655b5397d04c4258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-12 00:00:14 +00:00
Robert Luo
bc66c0aba9
Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev
2022-07-11 23:36:02 +00:00
Hugh Chen
95d2add6a2
RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings am: 858e6ff3d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588
Change-Id: I6ba14905e50fb1fad3036cd91a8d2c9ceac2621e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 23:09:47 +00:00
TreeHugger Robot
f38e8e6194
Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev
2022-07-11 22:50:58 +00:00
Grace Cheng
d39bc04b42
Display screen protector string and icon in fingerprint enrollment only on relevant devices am: 3c53dac81b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19224339
Change-Id: I4c9214324c86cc1070e2cec06a46f761b4afc689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-11 19:27:00 +00:00
ot_hemant.yadav
9a72877c7c
Crash happens if back button is pressed during "Format as Portable"
...
SD card format as internal, during migrate process press back key or During "Format as Portable",
press back key crash happened.
Fix:
Hide the bottom navigation from that particular activity so that user can not accidentally
press back key.
/packages/apps/Settings/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
/packages/apps/Settings/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
Bug: 238596768
Test:
1. Insert sdcard or generate virtual disk using command : adb shell "sm set-virtual-disk true"
2. Go to Settings -> Storage -> SD Card -> Format as Internal -> move later
3. After step 1, back to storage
4. Again enter in Storage -> SD Card -> to do migrate data
5. during migrate process press back key
6. Storage -> SD Card -> Format as Portable
7. During "Format as Portable", press back key
Change-Id: I1f393ffb872bb90d7dfeb4e1c86648b3413645a1
2022-07-11 17:21:04 +00:00
ykhung
764d513d00
Support multi-user privacy for battery usage chart
...
When there are multiple accounts in the devices, the battery usage list
is shared in the current design. We will aggregate other users usage
data into a single item to support multi-user privacy requirements
Screenshot: https://screenshot.googleplex.com/AkFTUtNvnoxcuGR
Bug: 202119550
Test: make RunSettingsRoboTests
Change-Id: I6cb55f0d50a4caca83212a0a54410530a032c089
2022-07-12 00:17:43 +08:00
Kuan Wang
e39ecafa1f
Add function getBatteryHistorySinceLastFullCharge, used to replace
...
getBatteryHistory in BatteryHistoryLoader.
getBatteryHistory couldn't be changed directly as it needs to be kept
for other features.
Bug: 236101687
Test: make RunSettingsRoboTests
Change-Id: I3e3cdd3a0225228bf76f6750f6a56f031666720f
Merged-In: I3e3cdd3a0225228bf76f6750f6a56f031666720f
2022-07-11 09:10:08 +00:00
Grace Cheng
3c53dac81b
Display screen protector string and icon in fingerprint enrollment only on relevant devices
...
Sets screen protector string and icon visibility to visible on UDFPS, and non-visible on non-UDFPS devices
Fixes: 230156966
Test: Navigate to fingerprint enrollment page to see string & icon are
gone on side-FPS device
Change-Id: I527fb0d944a7c8180297ad44efa3e9bba3012703
2022-07-08 23:39:32 +00:00
SongFerngWang
4a48dc5e96
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 289796e9a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541
Change-Id: Ib1c261e07e1878b60bd067694e19eea92bb11866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 20:45:47 +00:00
SongFerngWang
5ed0fddd7b
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 9712359f25 am: c559d2fc15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541
Change-Id: Id8bee70ff8e6315d4238191ef69616f738e1d84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 19:57:32 +00:00
SongFerngWang
c559d2fc15
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 9712359f25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541
Change-Id: Id45fdf5085bcbf49084accf95ffe46098668b74d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-08 19:25:25 +00:00