Commit Graph

82696 Commits

Author SHA1 Message Date
Jeremy Goldman
d0fc5df06c 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: I3e4b17c60c1a307e5e3b8542f3f09adebe54b801
2021-05-13 10:30:51 +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
a1410eaf8e 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: Ibd5711b522e559dd89f52313492170018ff83d1a
2021-05-13 07:40:08 +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
a050cc5c5d 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: Ib1e4cc50aecadca89427550d4bb421f645e52bd7
2021-05-13 06:49:30 +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
2e4a86d7cd 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: If544b9f9fc91727b5d57b40abd1367a43820a1d3
2021-05-13 05:54:22 +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
7a812a3cd5 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: I18e0fd1bad12fc5f91706371e9034aaf5f61be6a
2021-05-13 05:16:32 +00:00
TreeHugger Robot
b77ceac7d7 [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352144

Change-Id: I0cb5e429282a9e620163216bed205326ff74bede
2021-05-13 05:16:27 +00:00
Weng Su
e8c196cfed [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: d4cec9b628 am: 1599278d12 -s ours am: 54b155bd81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352144

Change-Id: Ic5e930ca963802438d79dbd59a0e94b8c456ed4e
2021-05-13 05:16:26 +00:00
TreeHugger Robot
16fed5d338 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: I09decb09372b7e30754006b71f513d84a62aaddf
2021-05-13 05:16:08 +00:00
Hugh Chen
0231e3972f [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: c556938807 am: 7b3da742d1 -s ours am: b548aa378d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316

Change-Id: I7302d401557e7495057518d30f09e129938946eb
2021-05-13 05:16:07 +00:00
Yanting Yang
63232a4cb8 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: I1493741db02fd2c2a375e45096af56a9085da1fc
2021-05-13 05:16:00 +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
3f50bb66f5 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: I317f96c0280826d1034a1e82943d121beb7d1de2
2021-05-13 04:30:52 +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
Curtis Belmonte
5129a027ff 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: I92038bfdfe5153386b909ba34cff99a71a1636b0
2021-05-13 04:30:41 +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
f20a2ad12c 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: Ieb9e9d9ec57ecc126d13c062f5ff206b408f7823
2021-05-13 03:21:14 +00:00
Jason Chiu
cb88a7e24d Merge "Redesign homepage IA icon" into sc-dev 2021-05-13 02:59:29 +00:00
TreeHugger Robot
40fa6928df 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: Ic98761f810155dcfe68e5e1b250becf65c08c428
2021-05-13 02:43:17 +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
d73c158986 [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: I72ddf9ed90c4a39e0584d1d101b12e02e7cacabf
2021-05-12 21:34:56 +00:00
Jakub Pawlowski
8831f3a905 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: I912f2eed4e254b9af11ff4045cbd37167558b031
2021-05-12 21:34:35 +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
8a672bacfd [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: Icf3760a6101d77ed2076d6f9a320c784fa97487c
2021-05-12 21:27:05 +00:00
Jakub Pawlowski
091fa86790 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 72cda9d96c am: bb78247cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I78e95ce42dde95361971f937bdab763a9292b82a
2021-05-12 21:26:57 +00:00
Abel Tesfaye
5c93b1df44 Merge "Add warning message when power save mode is enabled for attention settings fragment" into sc-dev am: 989570a9b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441367

Change-Id: Ibdd8876cfb18ce275288ed3df984ab5902b4473b
2021-05-12 21:26:41 +00:00
Abel Tesfaye
08737147fb Merge "Add warning message when power save mode is enabled for smart auto rotate settings fragment" into sc-dev am: 43905b3459
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14430041

Change-Id: I5f48ffb64e83a4307a1954ae5b13b9d4bd9e4566
2021-05-12 21:26:40 +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