Commit Graph

82892 Commits

Author SHA1 Message Date
Jernej Virag
0339dc8e23 Merge "Fix power+volume chord fallback when LPP option is disabled" into sc-dev am: 1f1cb3a7a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14500675

Change-Id: I07dc7ecab384234f46b73a1b680b538a2b071ddd
2021-05-13 13:28:54 +00:00
Jernej Virag
1f1cb3a7a8 Merge "Fix power+volume chord fallback when LPP option is disabled" into sc-dev 2021-05-13 13:13:25 +00:00
TreeHugger Robot
4b1087dac0 Merge "Fix talkback label "ACCOUNTS FOR OWNER" is not matching problem" into sc-dev am: 157a83a6f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519524

Change-Id: Icd1b33b8ba028bca7d8e275ec8b867f1f0470640
2021-05-13 13:06:47 +00:00
TreeHugger Robot
8bb19bf010 Merge "Notif Settings polish" into sc-dev am: f6b42231e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14517130

Change-Id: I5de6b6f19289aada6b8b4dd7fce09926cc7a214f
2021-05-13 13:06:39 +00:00
TreeHugger Robot
157a83a6f2 Merge "Fix talkback label "ACCOUNTS FOR OWNER" is not matching problem" into sc-dev 2021-05-13 12:56:02 +00:00
TreeHugger Robot
f6b42231e0 Merge "Notif Settings polish" into sc-dev 2021-05-13 12:51:51 +00:00
Sunny Shao
2fade46f0a Fix talkback label "ACCOUNTS FOR OWNER" is not matching problem
- Root cause: the content description is different with title.
- Solution: set the description same as title.

Fixes: 181192849
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accounts
Change-Id: Ic566d061e78eaf427add6aac4701142a6180e557
2021-05-13 11:36:17 +00:00
Jeremy Goldman
dd9d827c57 Merge "Store whether the Dialog was previously dismissed" into sc-dev am: 0c28e9dca7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518466

Change-Id: Ifc2101e68a749c3a20e73ce8ef9f1ef2a8df5428
2021-05-13 10:30:39 +00:00
Jeremy Goldman
0c28e9dca7 Merge "Store whether the Dialog was previously dismissed" into sc-dev 2021-05-13 10:11:14 +00:00
Wesley Wang
147be6bd09 Merge "Update restriciton page to support legacy string" into sc-dev am: b769cf8067
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514137

Change-Id: I891e12d531887e7805322d12362d1e70fe5736ac
2021-05-13 07:40:17 +00:00
Wesley Wang
b769cf8067 Merge "Update restriciton page to support legacy string" into sc-dev 2021-05-13 07:26:24 +00:00
YUKAI HUNG
8ec5b687ed Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev am: e69e95fed1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518469

Change-Id: Ia90962646023aba7de81695d94e9ad7149f7b575
2021-05-13 06:48:52 +00:00
Jeremy Goldman
09a185dbca Store whether the Dialog was previously dismissed
The dialog can be dismissed by either the framework automatically (i.e.
when the screen is rotated) or when the subscriptions change.

If both of these things happen while the class is not deleted, then
dismiss() will be called twice and there will be a crash

Bug: 184899699
Test: atest -c SettingsUnitTests
Change-Id: Ibaef59696feb566664a424f65f806396f02497e8
2021-05-13 14:42:26 +08:00
YUKAI HUNG
e69e95fed1 Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev 2021-05-13 06:34:36 +00:00
Arc Wang
ba14503b99 Merge "Fix Storage Settings progress bar summary jank problem" into sc-dev am: 3a77c9c9e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514140

Change-Id: Ic700afae3c43260fa38f7bff0bf62cb331ab34c5
2021-05-13 05:54:05 +00:00
Arc Wang
3a77c9c9e4 Merge "Fix Storage Settings progress bar summary jank problem" into sc-dev 2021-05-13 05:35:27 +00:00
Kevin Han
3bc7e79eb3 Merge "Add tests for HibernatedAppsPreferenceControllerTest" into sc-dev am: 9351dde1e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14506400

Change-Id: If29857e76e7b659a6366ca9647a511249741aba0
2021-05-13 05:16:22 +00:00
TreeHugger Robot
61c5e28884 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-qpr-dev am: 8b37f0a2cf am: f880a8bdf2 -s ours am: 635627a071 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352144

Change-Id: I6370f0817da423ec20e2ed6c4e05c09f304cd45c
2021-05-13 05:16:17 +00:00
Weng Su
73b946c666 [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: d4cec9b628 am: 1599278d12 -s ours am: 54b155bd81 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352144

Change-Id: Iad04ea3edb9e26d1bfd943eb3596ea43e7b2e90b
2021-05-13 05:16:16 +00:00
TreeHugger Robot
31468cf081 Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev am: d8cacc526a am: aa63f727d7 am: 879f4472ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316

Change-Id: Ic126e9ebab8cde18b3bd1777e0fc6ec69372c7b0
2021-05-13 05:16:04 +00:00
Hugh Chen
e4df3a799e [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: c556938807 am: 7b3da742d1 -s ours am: b548aa378d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316

Change-Id: Ib81c742548c4f0c785b82beed96a938f71fdc9db
2021-05-13 05:16:02 +00:00
Yanting Yang
079634bf5a Merge "Update homepage summaries for Display and Security" into sc-dev am: 9c3424449e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14501878

Change-Id: Ib453c71ee0b1530f1aa8dfd560a6f169ed518a40
2021-05-13 05:15:54 +00:00
Kevin Han
9351dde1e5 Merge "Add tests for HibernatedAppsPreferenceControllerTest" into sc-dev 2021-05-13 05:09:55 +00:00
ykhung
d2aa4cc7cb Make chart time slot not clickable when accessibility servie is enabled
after discuss with Shuan & Peggy, we will make the chat view is not
clickable since accessibility service is enabled for talkback, switch
access and voice access, since some gestures are conflict with our
design (double click to show all contents is conflict with a11y behavior)


Bug: 187814675
Test: make SettingsRoboTests
Change-Id: I00929a5ec28f83d6aee6e8c9278d61e6cf26428d
2021-05-13 05:06:55 +00:00
TreeHugger Robot
635627a071 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-qpr-dev am: 8b37f0a2cf am: f880a8bdf2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352144

Change-Id: I4f3cb534ff8470781cc0d2bb457a8eae4e4fc2cd
2021-05-13 05:02:38 +00:00
Weng Su
54b155bd81 [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: d4cec9b628 am: 1599278d12 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352144

Change-Id: I9d12be8ae4cb4db1ec3bb3ab2a03839ec02777c1
2021-05-13 05:02:36 +00:00
TreeHugger Robot
879f4472ec Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev am: d8cacc526a am: aa63f727d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316

Change-Id: Ia8e767643d5449fc5450e47ce9b22081ae6998d3
2021-05-13 05:02:26 +00:00
Hugh Chen
b548aa378d [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: c556938807 am: 7b3da742d1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316

Change-Id: I7104cb23a7d6d1d6fbe4a9ff5e6515cceab5c48b
2021-05-13 05:02:24 +00:00
Yanting Yang
9c3424449e Merge "Update homepage summaries for Display and Security" into sc-dev 2021-05-13 04:59:17 +00:00
TreeHugger Robot
f880a8bdf2 Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-qpr-dev am: 8b37f0a2cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352144

Change-Id: I94c8540520b22676509c147c123c6c14326f1c25
2021-05-13 04:46:26 +00:00
Weng Su
1599278d12 [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: d4cec9b628
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352144

Change-Id: I99448cc70e05c2a5d765a33fafeff1cf61b69ce8
2021-05-13 04:46:24 +00:00
TreeHugger Robot
aa63f727d7 Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev am: d8cacc526a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316

Change-Id: I35c3a5e629ee537d127edef24200985fa0038b0b
2021-05-13 04:46:17 +00:00
Hugh Chen
7b3da742d1 RESTRICT AUTOMERGE Fix unable to send file via OPP am: c556938807
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316

Change-Id: Iab901770b71e25819117d5cc4a84813f083e0511
2021-05-13 04:46:14 +00:00
Ryan Lin
eba7ba8844 Merge "Fix incorrect layout in RTL" into sc-dev am: a2f47b3299
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514126

Change-Id: Ib11154486a093f9b0e564f5dea1562e8490f63d7
2021-05-13 04:31:48 +00:00
Curtis Belmonte
d3771c0c5b Merge "Consolidate face enroll intro/consent screens" into sc-dev am: 5ed928f626
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14510896

Change-Id: I2c4613a459ba825530308b22aa9bac6e5e8b99ef
2021-05-13 04:30:55 +00:00
TreeHugger Robot
8b37f0a2cf Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-qpr-dev 2021-05-13 04:30:42 +00:00
Ryan Lin
a2f47b3299 Merge "Fix incorrect layout in RTL" into sc-dev 2021-05-13 04:27:18 +00:00
Curtis Belmonte
5ed928f626 Merge "Consolidate face enroll intro/consent screens" into sc-dev 2021-05-13 04:01:56 +00:00
Yanting Yang
b2eb2bbc28 Update homepage summaries for Display and Security
Also clear the redundant strings and tests.

Bug: 183586663
Test: robotests & visual
Change-Id: Iff149ac566c4b42d89810fe389ad4f723765b6b5
2021-05-13 11:55:48 +08:00
Jason Chiu
e3cfcf111e Merge "Redesign homepage IA icon" into sc-dev am: cb88a7e24d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187779

Change-Id: Ib8d361821eb160c546c5868d073aea485c584c57
2021-05-13 03:21:24 +00:00
Jason Chiu
cb88a7e24d Merge "Redesign homepage IA icon" into sc-dev 2021-05-13 02:59:29 +00:00
TreeHugger Robot
d3f02b8f2a Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev am: e5052a7b52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14522955

Change-Id: I7c22cab47bc33c2cdc38d36f5b505332d00f8459
2021-05-13 02:43:23 +00:00
TreeHugger Robot
e5052a7b52 Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev 2021-05-13 02:09:57 +00:00
TreeHugger Robot
d8cacc526a Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev
* changes:
  RESTRICT AUTOMERGE Fix unable to send file via OPP
  RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
2021-05-13 01:33:00 +00:00
Curtis Belmonte
cef573f2d0 Consolidate face enroll intro/consent screens
Updates the UI of the face enroll intro screen based on the latest
mocks, while still allowing strings to be overlaid depending on the
device and/or face auth implementation.

Test: Manually tested face enrollment

Bug: 187207438
Change-Id: I5d912261b1eecfc7a241d6b48d549c4ff253ecdf
2021-05-12 17:26:17 -07:00
Jakub Pawlowski
d14f038dad [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours am: aab008b6be -s ours am: 50b308df2e -s ours am: c19ad05b02 -s ours
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 9d99e0b3ff is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882

Change-Id: I746dff9535c0a7efa4800776126de4b2acd5858f
2021-05-12 21:34:49 +00:00
Jakub Pawlowski
d9991e17f1 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 123cb13df8 am: ed9a891fa1 am: 355dcf3757
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: Id59f3bd153008a8ce45a5597eaab81db9c31104e
2021-05-12 21:34:32 +00:00
Jakub Pawlowski
c19ad05b02 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours am: aab008b6be -s ours am: 50b308df2e -s ours
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 9d99e0b3ff is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882

Change-Id: I277fd8ec00ac06943d9fab6d323b98fc0c8277e4
2021-05-12 21:28:38 +00:00
Jakub Pawlowski
355dcf3757 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 123cb13df8 am: ed9a891fa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I2767a67fe1992f1e38eb1ad3d2f3f7c900a6098f
2021-05-12 21:28:15 +00:00
Jakub Pawlowski
597616687f [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours am: 694f25b2c7 -s ours am: b0da292758 -s ours
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882

Change-Id: I9377401f33935efaac969885d8374a3f85898cb0
2021-05-12 21:26:56 +00:00