YUKAI HUNG
a4a1e78445
Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev am: e69e95fed1
am: e6e913cb4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518469
Change-Id: I9cb1b1088b4040e4240a15f62a941397adad17f5
2021-05-13 07:40:33 +00:00
YUKAI HUNG
e6e913cb4d
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: I16f52d1394090fd0c72c75b1230afbe8b5ddcac9
2021-05-13 06:51:09 +00: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
7f73bc3748
Merge "Fix Storage Settings progress bar summary jank problem" into sc-dev am: 3a77c9c9e4
am: dddedfec43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514140
Change-Id: Iec86fd6fcc1b200b095167ef28bd3b90c756cc8f
2021-05-13 06:09:42 +00:00
Arc Wang
dddedfec43
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: I7f0780f5464d43fc73b55fc1ba4d0c912125739c
2021-05-13 05:55:59 +00:00
Kevin Han
ffbe9b97b8
Merge "Add tests for HibernatedAppsPreferenceControllerTest" into sc-dev am: 9351dde1e5
am: bc2f8699df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14506400
Change-Id: Ic91ff7c92acad6a1dc5bdd622589c05f3930572f
2021-05-13 05:48:39 +00:00
TreeHugger Robot
1078966194
[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
am: c1056881e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352144
Change-Id: I16c4ff7727429e2cec0116f7dca0b6ddc5587321
2021-05-13 05:48:34 +00:00
Weng Su
0f88115c3a
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: d4cec9b628
am: 1599278d12
-s ours am: 54b155bd81
am: f9160ce57f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352144
Change-Id: Idea12076a22c9645df1acd2ee6154da178f21c28
2021-05-13 05:48:33 +00:00
TreeHugger Robot
dd7d5bbc96
Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev am: d8cacc526a
am: aa63f727d7
am: 879f4472ec
am: 0d44dd5a0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316
Change-Id: Ibf65003a0272b738faaafd2dc83d0ac1986923d9
2021-05-13 05:47:31 +00:00
Hugh Chen
f2ddf4bfab
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: c556938807
am: 7b3da742d1
-s ours am: b548aa378d
am: 7e9405edc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316
Change-Id: I5be7f06968bc4d1b198567287f7b68ee979462fe
2021-05-13 05:47:30 +00:00
Yanting Yang
a5d03f662e
Merge "Update homepage summaries for Display and Security" into sc-dev am: 9c3424449e
am: 7b61ed248c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14501878
Change-Id: I789b0d5737c344674764dbd125c1ca3843d483e3
2021-05-13 05:47:19 +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
bc2f8699df
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: I2efaac8f7081936b103045ab4d5510c9c5bd862e
2021-05-13 05:18:14 +00:00
TreeHugger Robot
c1056881e9
[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: I264c13cbb2b154a9bfee7427e9189c83fde38b0d
2021-05-13 05:18:10 +00:00
Weng Su
f9160ce57f
[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: I64a72e74560b88429a5b2f5e9eaea7c3beaaacf6
2021-05-13 05:18:08 +00:00
TreeHugger Robot
0d44dd5a0d
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: Ide0123751cdec75e17a2b56cda35662cfda72f18
2021-05-13 05:17:56 +00:00
Hugh Chen
7e9405edc9
[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: I80f1f16f9b07307ef7bef951dc49704804aa3b0f
2021-05-13 05:17:55 +00:00
Yanting Yang
7b61ed248c
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: Ib84ebcf4c176951e581d7c760ca0a9225170b737
2021-05-13 05:17:48 +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
Ryan Lin
8f41a70d54
Merge "Fix incorrect layout in RTL" into sc-dev am: a2f47b3299
am: a8920e8cae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514126
Change-Id: Id969ec2f9d1e460ab3f191d7828d922aa9f91bf2
2021-05-13 04:53:26 +00:00
Curtis Belmonte
9331f6d774
Merge "Consolidate face enroll intro/consent screens" into sc-dev am: 5ed928f626
am: f88242c07c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14510896
Change-Id: I607d0c5de2f43dce541bfcc554a7cc2bc1271e14
2021-05-13 04:52:32 +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
a8920e8cae
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: Idf7bb6b00479477dd0a8564a6a6e8cbcb7aa4a51
2021-05-13 04:33:10 +00:00
Curtis Belmonte
f88242c07c
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: I4c2a97041d8e996960d11ae1bd3707274240990a
2021-05-13 04:32:24 +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
f1be36eeec
Merge "Redesign homepage IA icon" into sc-dev am: cb88a7e24d
am: de90a36450
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187779
Change-Id: Ic6590dc8ee715f13d7623707412d1e3eb10029f3
2021-05-13 03:53:33 +00:00
Jason Chiu
de90a36450
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: I5fbe505f7d1c16cf7c6f47d2f6518534caa2041d
2021-05-13 03:23:19 +00:00
Jason Chiu
cb88a7e24d
Merge "Redesign homepage IA icon" into sc-dev
2021-05-13 02:59:29 +00:00
TreeHugger Robot
8fe97b906e
Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev am: e5052a7b52
am: 809335aaa6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14522955
Change-Id: I32c639ec0c79df89c917c3b2f4537eb3a34d9e0d
2021-05-13 02:57:53 +00:00
TreeHugger Robot
809335aaa6
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: I4e9b109d10341d06298903801138ab01d9cd0452
2021-05-13 02:44:35 +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
0470fbade0
[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: 5801d2af17
-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: I20c2418e423ccea5830f395e79252d70099348fe
2021-05-12 21:43:10 +00:00
Jakub Pawlowski
6949e55ce1
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
am: c714533fd2
am: 123cb13df8
am: ed9a891fa1
am: 355dcf3757
am: 9e52c1621b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: I63123cad53512077d0aba487ea4e9b5677916ea1
2021-05-12 21:43:02 +00:00
Jakub Pawlowski
d2bc02746e
[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: d62548790b
-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: I007c15edb008ad9f0ee9af51b255a95cd3fddd8d
2021-05-12 21:42:55 +00:00
Jakub Pawlowski
c7621e5c88
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
am: 52ea712e3b
am: c714533fd2
am: 72cda9d96c
am: bb78247cf0
am: b96d8078b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: I831801c31ca9dcf8bd1092139a272e685ab1c713
2021-05-12 21:42:47 +00:00
Abel Tesfaye
55b1368af8
Merge "Add warning message when power save mode is enabled for attention settings fragment" into sc-dev am: 989570a9b6
am: bc59298a10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441367
Change-Id: I08f242d897d96c5691ace7ec176d7ab771d7167f
2021-05-12 21:41:45 +00:00