Julia Reynolds
50e36ee0b4
Merge "Fix vertical alignment in history" into sc-dev am: 14f204af54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14532408
Change-Id: I52b9a01489ec3c48d4ebee05f22bcca46cdd0fd1
2021-05-13 22:06:12 +00:00
Julia Reynolds
5094e6bfbd
Use | not , am: 78c4e70cf6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14534046
Change-Id: I3988a699cf025417e8063260f4422831ed60e944
2021-05-13 22:05:52 +00:00
Julia Reynolds
14f204af54
Merge "Fix vertical alignment in history" into sc-dev
2021-05-13 21:51:03 +00:00
Julia Reynolds
78c4e70cf6
Use | not ,
...
To match similar APIs
Test: Settings unit
Bug: 181175697
Change-Id: I2ef56528da7a3d5b2c96be8ecfad1a3d6590bbe4
2021-05-13 19:24:17 +00:00
Edgar Wang
125ba18f8e
Remove the divider above footer in Gesture Navigation Settings
...
Fixes: 180568503
Test: manual
Change-Id: I3cadc106fa0b41a1b98d083d6a2ada5640a4295c
2021-05-14 02:48:56 +08:00
Kevin Chyn
9a4f0d2c6c
Update a few more strings
...
1) Fingerprint intro page footer buttons
2) Screen lock removal positive button
3) Update UDFPS string logic
4) Update UDFPS strings during enrollment
5) Update generic fingerprint enroll completion message
Bug: 187868985
Test: manually, in settings and SUW
Change-Id: Iddcc0a65c3f410b4ae33a760dfcc57aba4bcc7f9
2021-05-13 11:47:41 -07:00
Julia Reynolds
77955974da
Fix vertical alignment in history
...
Test: visual with a ruler
Fixes: 187758949
Change-Id: I337210e9052354aaec5ad93c7147d439ca0f9852
2021-05-13 13:05:48 -04:00
Bill Yi
897c996f6d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b7b6f180b
-s ours am: 5ab07c89a2
-s ours am: 3d867d50f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14529491
Change-Id: Ia256fe7d3bb0723ce1cfe940011a89d2a749376c
2021-05-13 14:51:51 +00:00
Bill Yi
45af2ee2c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 933340766b
-s ours am: 64e44f83b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14529490
Change-Id: I265b6553e250a1af24c3c70a0fe77b2140e0d3a3
2021-05-13 14:51:40 +00:00
Bill Yi
3d867d50f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b7b6f180b
-s ours am: 5ab07c89a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14529491
Change-Id: I08a2e4d43cbf695e09d2085d0c8958382936ae01
2021-05-13 14:38:21 +00:00
Bill Yi
64e44f83b9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 933340766b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14529490
Change-Id: I131938ec658ef53b4ab04a51068b2fd7c62b7395
2021-05-13 14:37:22 +00:00
TreeHugger Robot
1b01f10904
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4cb355f8e5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14530042
Change-Id: I67344503aa0a9e065c1211fdf11ef1e191cd322d
2021-05-13 14:29:59 +00:00
ykhung
11de1a6452
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: I7eecafc42cf4b4a0374ab46f07461e77907fc03a
2021-05-13 14:26:51 +00:00
Bill Yi
5ab07c89a2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b7b6f180b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14529491
Change-Id: I9628a56974608d0993a01212e9d671a92bfb72bb
2021-05-13 14:22:37 +00:00
TreeHugger Robot
4cb355f8e5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-05-13 14:09:39 +00:00
Arc Wang
b7202aa332
Fix NPE in DrawOverlayDetails#getSummary
...
When AppEntry is null (APP uninstalled), returns
an empty summary string.
Bug: 172381586
Test: build pass
Change-Id: I63fbeaaec6f2d0de617c6e104af341806605a6c2
2021-05-13 21:39:31 +08:00
Jernej Virag
4ba267cff5
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: I6d8a38fa1f1e79b1d1955aac7844eb7e4e83b002
2021-05-13 13:29:01 +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
06e3d2c58b
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: I7399d43798ef2352e0f3eabad8b7fa2d41db8f2a
2021-05-13 13:06:52 +00:00
TreeHugger Robot
d4411004c0
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: Id8591c24aaf9b48eb7d0a0d0ebb45566b9f2530c
2021-05-13 13:06:47 +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
Yanting Yang
90d323cefa
Move DWB to the fifth position from the bottom on the homepage
...
Remove relevant configs, logics and tests.
Bug: 187885890
Test: robotests & visual
Change-Id: I309d5290f19bf0b01692dd6f14c4cdcc52066453
2021-05-13 20:51:47 +08: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
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
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
Bill Yi
7b7b6f180b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1d2438e12168ac22fedf915c1f1ebb6e28b04ef3
2021-05-13 09:43:43 +00:00
Bill Yi
933340766b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6b43d54021ed1e8ecefdb22b2514125e9af47e41
2021-05-13 09:37:45 +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