Commit Graph

45115 Commits

Author SHA1 Message Date
Treehugger Robot
eff730475e Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 am: 984e74a32e am: 5d95b855dc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: I147a3065c4b214508b325c02e95da68ad22fec0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 10:57:12 +00:00
Treehugger Robot
5d95b855dc Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 am: 984e74a32e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Ib32baeda6471ed9a8a2e5aa2cd84088505c1f7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 10:26:46 +00:00
Treehugger Robot
984e74a32e Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: I03ee47dea1bfc1ac0f5d6f49e738346571f304e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 09:57:27 +00:00
Treehugger Robot
41e0e6fea7 Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Iaeef4967d528aca3e4d66f98952635cb97ed9350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 09:27:24 +00:00
Treehugger Robot
4d5951c6ef Merge "Settings: Protect sensitive data on the about phone" 2022-09-24 08:23:53 +00:00
Tom Hsu
f2a63608ba Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4 am: 1a4f16cd70 am: db0ec844f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: I399a80e1e609a14c2f6c821e8e3df36fa8983dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 17:12:22 +00:00
Tom Hsu
db0ec844f2 Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4 am: 1a4f16cd70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: Idc4f0c59df19b6f0cc9a8a1db70ba546f12fafaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 08:40:25 +00:00
Tom Hsu
1a4f16cd70 Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: Iaccb8b8c54a5f84ed3ca6fec869ba0153f4eb623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 07:59:37 +00:00
Tom Hsu
7c813dced4 Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: Iacf9e213bb1f40859320957d7846803f4aeaa30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 07:32:19 +00:00
Grace Cheng
f9b0a270db Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev am: afa2bb1ea5 am: 0676835aa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19994169

Change-Id: I2a1350fbcaf999657217eb9de4fd0bd2d1b888f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 21:43:15 +00:00
Grace Cheng
0676835aa0 Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev am: afa2bb1ea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19994169

Change-Id: I0eb173743779ac3a88bbdfa56e77e610dc834131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 21:11:25 +00:00
Grace Cheng
afa2bb1ea5 Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev 2022-09-22 20:28:33 +00:00
Grace Cheng
59f4b7bdc9 Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev am: 108b73d972
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19995253

Change-Id: Ifc2d6aeaba2ac559b695fd1084ce6668fcc8c94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 18:38:19 +00:00
Grace Cheng
a738eba09f Adds null-check on finger animation in enrollment
Adds a null-check before setting the finger animation during SFPS
enrollment

Test: Change display size to highest setting (sets mShouldShowLottie to
false), and verify that user can enroll finger successfully
Fixes: 247044864

Change-Id: I3d7f0bd3078e3a4516f656a8ee897387b0ca15c6
2022-09-22 17:54:27 +00:00
Grace Cheng
108b73d972 Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev 2022-09-22 17:37:13 +00:00
tom hsu
3d138b372b [Settings] Update UI when bluetooth connection is down.
- When Airplane mode on, all connection shall be disconnected. In
   current design, when bluebooth disconnected, network page in Settings
   does not udpate the UI.

Bug: b/246925011
Test: Maunal
Change-Id: I1bf56e96737157d8e76057028b22e94e0e8d76e4
2022-09-22 19:34:35 +08:00
PETER LIANG
93a613f2f6 Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev am: 71c3e06bea am: dace33e3c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997091

Change-Id: I2de86b0a6b8eac29e04fb8ce6c77750d88321322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 09:20:28 +00:00
PETER LIANG
dace33e3c3 Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev am: 71c3e06bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997091

Change-Id: I735fa2d96c60a92c270208620909353c25619960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 08:51:25 +00:00
PETER LIANG
71c3e06bea Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev 2022-09-22 08:29:50 +00:00
Jason Hsu
b161bade37 Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac1712145
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20008465

Change-Id: I2a8dd8e4bb9f11ab239ec7a4e420b38c52623a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 08:27:44 +00:00
Jason Hsu
9ac1712145 Merge "Fix not on the top when entering device detail page" into tm-qpr-dev 2022-09-22 07:37:28 +00:00
Zekan Qian
daceb0cabb Merge "Explicitly set parameter name when call SettingsPage.create function" 2022-09-22 07:18:03 +00:00
Bonian Chen
e32f252b8a Merge "[Settings] Remove unreferenced method" 2022-09-22 06:23:36 +00:00
Chaohui Wang
faf11f96e7 Merge "Clean up AppButtonsPreferenceController" 2022-09-22 04:59:12 +00:00
Bill Lin
4c9e259ccd Merge "Apply dark light theme for enrollment activities" into tm-qpr-dev am: a46b426bcf am: 8a8fe4fabd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19989471

Change-Id: Id20b934f044607e7b4f93b2d5cb5ce37322fd65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 03:42:27 +00:00
Zekan Qian
90e5e91f28 Explicitly set parameter name when call SettingsPage.create function
Bug: 244122804
Test: manual - build SettingsGoogle
Change-Id: I068857ac3a5e12cfcf0148789b546476663414e1
2022-09-22 11:08:02 +08:00
Bill Lin
8a8fe4fabd Merge "Apply dark light theme for enrollment activities" into tm-qpr-dev am: a46b426bcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19989471

Change-Id: I4b46bef348873f663b4c7368a2e659359e6f8486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 02:46:29 +00:00
Chaohui Wang
d21f5916d2 Clean up AppButtonsPreferenceController
mDisableAfterUninstall and mUpdatedSysApp is always false.
And appChanged is always true.

Bug: 236346018
Test: Manual with Settings App
Change-Id: Icfb9fbea92d5c728cbef9d76569d59d5085a51e6
2022-09-22 10:02:44 +08:00
Bill Lin
a46b426bcf Merge "Apply dark light theme for enrollment activities" into tm-qpr-dev 2022-09-22 01:55:59 +00:00
Peter Liang
6a847bba04 Fix that display size and text preview is going blank while scrolling the page in landscape view.
Problem:
It seems that the inconsistent index would cause the view stub couldn't be inflated successfully.

Solution:
Adjust it to the same index.

Fix: 244336110
Test: manual test
Change-Id: I2688e6feb61ac64f989e5f8e4910e6eeca3a97bf
2022-09-22 01:20:45 +00:00
Daniel Sandler
4592c110e0 Merge "Launch the platform easter egg in a new task." into tm-qpr-dev am: e43bf3cd9d am: ba81fe61cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20003711

Change-Id: I76b538e6df566b1cbd9f6f36e9813e71768bb0f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22 00:30:19 +00:00
Daniel Sandler
ba81fe61cf Merge "Launch the platform easter egg in a new task." into tm-qpr-dev am: e43bf3cd9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20003711

Change-Id: I794c118911d6d2fa47ff9190a6108fc1e3d0f11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:22:53 +00:00
TreeHugger Robot
49bdf64e2e Merge "Avoid fade animation when users switch index in hour chart." into tm-qpr-dev am: 581fd171b5 am: 4c9ca7563f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997086

Change-Id: Idbc9311f681fbeda68d28e87a7664f12bc4c53b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 23:18:52 +00:00
TreeHugger Robot
4c9ca7563f Merge "Avoid fade animation when users switch index in hour chart." into tm-qpr-dev am: 581fd171b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997086

Change-Id: If131776cab08c56c05b3e418c06730f63a21be59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:49:38 +00:00
Binyi Wu
e0a1ba9463 Merge "Prevent intent defined in AccountPreference from leaking access" into tm-qpr-dev am: effd45b308 am: b2aa91a331
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19852695

Change-Id: I9aee9ecb42c05fadf7bfc7b2345644e32b72dd0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:35:26 +00:00
TreeHugger Robot
9a4844c2a9 Merge "Show app list in Battery Usage page when there is no battery level data." into tm-qpr-dev am: 53f1e23d63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949396

Change-Id: Id8871a6434f46e39f9814490c6cb85eb9529d50e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:22:16 +00:00
Binyi Wu
b2aa91a331 Merge "Prevent intent defined in AccountPreference from leaking access" into tm-qpr-dev am: effd45b308
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19852695

Change-Id: I682ca9613cd67d56d1a6b8882b986abe15f140b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:20:43 +00:00
Grace Cheng
cd17b27cdf Merge "Fix alignment of finger animation with progress bar" 2022-09-21 20:32:06 +00:00
Quang Luong
1b233b37c3 Merge "Do not request P2P if user declined interface conflict dialog" 2022-09-21 16:24:37 +00:00
jasonwshsu
35e20d5ace Fix not on the top when entering device detail page
Root Cause: Added SpacePreference in xml let the page renders order
incorrectly.

Solution: That SpacePreference should only be visible when the device is
hearing aid.

Bug: 245681095
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Merged-In: Ic0be940c8466b5e1e301255868c29d06bd4428bd
Merged-In: I442445a861898258a73f37ad8f85bcee387fbf58
Change-Id: Icca48d9c2643507638b2b581d052530521cce5df
2022-09-21 23:54:15 +08:00
Jason Hsu
a1cb4fd446 Merge "Fix not on the top when entering device detail page" 2022-09-21 14:50:32 +00:00
Daniel Sandler
e43bf3cd9d Merge "Launch the platform easter egg in a new task." into tm-qpr-dev 2022-09-21 14:11:57 +00:00
jasonwshsu
cfec092373 Fix not on the top when entering device detail page
Root Cause: Added SpacePreference in xml let the page renders order
incorrectly.

Solution: That SpacePreference should only be visible when the device is
hearing aid.

Bug: 245681095
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Change-Id: Ic0be940c8466b5e1e301255868c29d06bd4428bd
2022-09-21 16:00:12 +08:00
TreeHugger Robot
581fd171b5 Merge "Avoid fade animation when users switch index in hour chart." into tm-qpr-dev 2022-09-21 05:50:50 +00:00
TreeHugger Robot
53f1e23d63 Merge "Show app list in Battery Usage page when there is no battery level data." into tm-qpr-dev 2022-09-21 05:50:45 +00:00
Binyi Wu
effd45b308 Merge "Prevent intent defined in AccountPreference from leaking access" into tm-qpr-dev 2022-09-21 04:14:11 +00:00
Dan Sandler
5eeb6c3792 Launch the platform easter egg in a new task.
This ensures that when PlatLogoActivity is launched on a
large-screen device, it properly takes over the full screen
(and doesn't hide the status bar for Settings!).

Bug: 243407943
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FirmwareVersionDetailPreferenceControllerTest
Change-Id: Icf10aa43e5b4a27a2fa98ea41b5a9e9cf659e895
2022-09-20 20:10:17 -04:00
Quang Luong
0fe65b582a Do not request P2P if user declined interface conflict dialog
P2P iface requests may prompt the user to accept/decline. We should avoid prompting the user twice by not making any additional P2P iface requests after the user declines (i.e. device becomes unavailable).

Bug: 243436630
Test: enable iface creation dialog and turn on STA + AP, verify dialog
does not reappear after user reject in P2P Settings

Change-Id: I6fdda273d898c1d456a1f39d90b1257c8ff4de15
2022-09-20 17:44:57 +00:00
Grace Cheng
76902f4b7c Fix alignment of finger animation with progress bar
Makes progress bar opaque and fixes color codes accordingly, and adjusts
values to shift finger animation and progress bar for proper alignment

Test: Enroll finger in light and dark theme and observe alignment of
finger with progress bar
Fixes: 245819077
Change-Id: I26bea8e1870f08b413a4ec2a9e6e83015facd004
Merged-In: I26bea8e1870f08b413a4ec2a9e6e83015facd004
2022-09-20 16:53:09 +00:00
Grace Cheng
415314113b Fix alignment of finger animation with progress bar
Makes progress bar opaque and fixes color codes accordingly, and adjusts
values to shift finger animation and progress bar for proper alignment

Test: Enroll finger in light and dark theme and observe alignment of
finger with progress bar
Fixes: 245819077
Change-Id: I26bea8e1870f08b413a4ec2a9e6e83015facd004
2022-09-20 16:13:14 +00:00