TreeHugger Robot
4cb355f8e5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-05-13 14:09:39 +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
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
0c28e9dca7
Merge "Store whether the Dialog was previously dismissed" into sc-dev
2021-05-13 10:11:14 +00:00
Bill Yi
a86d1eefbe
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5b1dc79e4f1c265dc4c92d84f3828c09a0a7aa76
2021-05-13 09:54:57 +00:00
Wesley Wang
b769cf8067
Merge "Update restriciton page to support legacy string" into sc-dev
2021-05-13 07:26:24 +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
3a77c9c9e4
Merge "Fix Storage Settings progress bar summary jank problem" into sc-dev
2021-05-13 05:35:27 +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
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
cb88a7e24d
Merge "Redesign homepage IA icon" into sc-dev
2021-05-13 02:59:29 +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
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
b0da292758
[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 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: I8a18f3daaac645a495de33a0e479fa699857c872
2021-05-12 21:12:17 +00:00
Jakub Pawlowski
bb78247cf0
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
am: c714533fd2
am: 72cda9d96c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: I41cb6bd53a787214896c7875104c6b08419b3047
2021-05-12 21:12:09 +00:00
Jakub Pawlowski
50b308df2e
[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 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: I5492bdd0db4d3ee60faf96a93ec8011a186b471a
2021-05-12 21:11:37 +00:00
Jakub Pawlowski
ed9a891fa1
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
am: c714533fd2
am: 123cb13df8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: I4cc43b913f4d2b3a15355bcf0be91b2e63d6a2ed
2021-05-12 21:11:26 +00:00
Jakub Pawlowski
694f25b2c7
[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 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: I5c4bcf5792f7e9a5564444bb5d5c98f473e1b619
2021-05-12 20:57:33 +00:00
Jakub Pawlowski
72cda9d96c
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
am: c714533fd2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: Ic9497921a93fb77c05f2d396503f0b3764734586
2021-05-12 20:57:26 +00:00
Jakub Pawlowski
aab008b6be
[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 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: If34b09d6e20810bb672c0e88ad21d6a8903ddcb8
2021-05-12 20:55:59 +00:00
Jakub Pawlowski
123cb13df8
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
am: c714533fd2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: I64eb60c0041ffd2f07b2b879fd2daf082a6b331e
2021-05-12 20:55:50 +00:00
Jakub Pawlowski
8ae86914d6
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours am: 8797825bc1
-s ours am: 31c29a0791
-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: I1cd894a5924c4afc52256d85f9a19da5a2cede22
2021-05-12 20:36:51 +00:00
Jakub Pawlowski
c714533fd2
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: I47b6e2b3de493030adfd49bfeb4aabaf16046771
2021-05-12 20:36:41 +00:00
Jakub Pawlowski
31c29a0791
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours am: 8797825bc1
-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: I145082eccf613bb5729b67a7f58a34f3c913184e
2021-05-12 20:19:24 +00:00
Jakub Pawlowski
52ea712e3b
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: Ied144c16d607921281d10783a77ae0d46885d757
2021-05-12 20:19:16 +00:00
Kevin Han
25ed73fa51
Add tests for HibernatedAppsPreferenceControllerTest
...
Add tests for getNumHibernated in HibernatedAppsPreferenceController
based off the major use cases.
Bug: 187745929
Test: atest HibernatedAppsPreferenceControllerTest
Change-Id: I7bee75075f12fc1661f1b12da82e6ccb16eaa06d
2021-05-12 13:09:09 -07:00
Jakub Pawlowski
8797825bc1
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-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: I65f86808c2d2455c98c022ad52680597c58ff148
2021-05-12 20:04:53 +00:00
Jakub Pawlowski
d6ed1528cb
Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: Iddc0d74ef10d404f8463544683cc913656346a34
2021-05-12 19:47:21 +00:00
Guojing Yuan
19235b8bba
Fix task affinity for NotificationAccessConfirmationActivity
...
Fix: 186029669
Test: manual
Change-Id: I366d4d6502d6d89b3d9d53d9190f376f678bccc1
2021-05-12 19:37:44 +00:00
Abel Tesfaye
989570a9b6
Merge "Add warning message when power save mode is enabled for attention settings fragment" into sc-dev
2021-05-12 19:27:51 +00:00
Abel Tesfaye
43905b3459
Merge "Add warning message when power save mode is enabled for smart auto rotate settings fragment" into sc-dev
2021-05-12 19:27:51 +00:00