Commit Graph

82325 Commits

Author SHA1 Message Date
Treehugger Robot
d7a8602192 Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d am: a2dc65e71e am: 68b3473610 am: d70199e634 am: 3a5720b95f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889

Change-Id: I82e3cfcf3e654b8d0bd968df8bd9f017a98f9500
2021-05-14 05:55:19 +00:00
Treehugger Robot
3a5720b95f Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d am: a2dc65e71e am: 68b3473610 am: d70199e634
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889

Change-Id: I452d4d4f177eeb6042dc419e36699995fc36c7dc
2021-05-14 05:25:48 +00:00
Treehugger Robot
d70199e634 Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d am: a2dc65e71e am: 68b3473610
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889

Change-Id: I68a79558c465c96ea9b805f87acce0d406991b8d
2021-05-14 05:10:44 +00:00
TreeHugger Robot
c816d52137 Merge "Account settings: Fix duplicate title and extra padding." into sc-dev am: 52f627f9ef am: 5390257b90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14488985

Change-Id: Ia41b8dfc942f26f17196e20edfb25e0a7fd4c402
2021-05-14 04:55:14 +00:00
TreeHugger Robot
ee2bb5e698 Merge "Fixed extra padding in "Open by default" page" into sc-dev am: 8b9f1d4f9e am: b151225fae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540523

Change-Id: Ibdb027829960635f53ebabe1b7b5b295523724cd
2021-05-14 04:54:42 +00:00
Treehugger Robot
68b3473610 Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d am: a2dc65e71e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889

Change-Id: I62a812859d2eec5a9c92c40f9fd4bdf800743f80
2021-05-14 04:54:03 +00:00
TreeHugger Robot
c847bf6b08 Merge "Fix work profile picker user icon didn't follow UX guideline" into sc-dev am: c3dfd37df6 am: fee3049603
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540524

Change-Id: Id1f1cec3c338e9b9970e2754a5318fbbb32c72e4
2021-05-14 04:53:48 +00:00
Treehugger Robot
a2dc65e71e Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889

Change-Id: I966b9ede97c0d3e997b96dc012ffdd6476688448
2021-05-14 04:38:14 +00:00
TreeHugger Robot
5390257b90 Merge "Account settings: Fix duplicate title and extra padding." into sc-dev am: 52f627f9ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14488985

Change-Id: I3fcd962a89216a7abf98304d937d2e733984c608
2021-05-14 04:34:12 +00:00
TreeHugger Robot
b151225fae Merge "Fixed extra padding in "Open by default" page" into sc-dev am: 8b9f1d4f9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540523

Change-Id: I35924e1cf72d4923ebd5916ea09f2d133befe1fc
2021-05-14 04:33:52 +00:00
TreeHugger Robot
fee3049603 Merge "Fix work profile picker user icon didn't follow UX guideline" into sc-dev am: c3dfd37df6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540524

Change-Id: Ida7d57f7c51933cab11b94a6ce730dfcc8253751
2021-05-14 04:33:33 +00:00
TreeHugger Robot
52f627f9ef Merge "Account settings: Fix duplicate title and extra padding." into sc-dev 2021-05-14 04:14:24 +00:00
Treehugger Robot
a3da419c8d Merge "Device picker: add title to fix offset in progressbar" 2021-05-14 04:12:44 +00:00
TreeHugger Robot
8b9f1d4f9e Merge "Fixed extra padding in "Open by default" page" into sc-dev 2021-05-14 03:57:18 +00:00
TreeHugger Robot
c3dfd37df6 Merge "Fix work profile picker user icon didn't follow UX guideline" into sc-dev 2021-05-14 03:39:38 +00:00
TreeHugger Robot
9f2ac978a4 Merge "Remove the divider above footer in Gesture Navigation Settings" into sc-dev am: e01099b245 am: 22f1137335
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515939

Change-Id: I0cd8e205c026f84d4717c59640e259ae808a93fb
2021-05-14 03:02:05 +00:00
Yanting Yang
7a4588d348 Merge "Move DWB to the fifth position from the bottom on the homepage" into sc-dev am: 542ba7477e am: 1e14321bfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519526

Change-Id: Ia454f57b8c1c5571291d6c8942827c0e7f7b7afa
2021-05-14 03:01:58 +00:00
YUKAI HUNG
9b31388f0d Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev am: f70cb82b0c am: 185c38f26c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515927

Change-Id: Ic04cc01dd5f115a539e0576018be984a754629a2
2021-05-14 03:01:52 +00:00
Tiffany Nguyen
e3a46ae42a Merge "Redirect battery-level settings preference clicks if needed" into sc-dev am: df8537269f am: 77728801c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486116

Change-Id: I292f5a34403d0e1f15db100db6a7ffbcd57df142
2021-05-14 03:01:09 +00:00
Ahaan Ugale
6663bed71c Account settings: Fix duplicate title and extra padding.
This change reverts the change in
I3981ce73fef63f06a40e61e894481d24284614ba to add a PreferenceCategory
for the accounts after merging the page with autofill settings. That was
done to get the Accounts heading to display for the personal/work
profile view.
This change instead sets the title on the existing PreferenceCategory
that's created dynamically in the Controller.

Removing the extra PreferenceCategory also fixes the padding.

Fix: 183677515
Bug: 183677706
Test: manual - with single profile, with personal/work profiles
Test: make -j RunSettingsRoboTests \
 ROBOTEST_FILTER="com.android.settings.accounts.AccountPreferenceControllerTest"
Change-Id: Ib7fe6f97b93b81d5a5897280cdd6bbad1b75f3a9
2021-05-13 19:49:04 -07:00
TreeHugger Robot
22f1137335 Merge "Remove the divider above footer in Gesture Navigation Settings" into sc-dev am: e01099b245
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515939

Change-Id: I4ef7edc08b59977b15dc5809af6483bd2b9f6c34
2021-05-14 02:47:52 +00:00
TreeHugger Robot
e01099b245 Merge "Remove the divider above footer in Gesture Navigation Settings" into sc-dev 2021-05-14 02:42:43 +00:00
Yanting Yang
1e14321bfe Merge "Move DWB to the fifth position from the bottom on the homepage" into sc-dev am: 542ba7477e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519526

Change-Id: I59a058623f28e1b746482f1d948401b49b114570
2021-05-14 02:41:50 +00:00
YUKAI HUNG
185c38f26c Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev am: f70cb82b0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515927

Change-Id: I32264a231a43c0bdff7d2d8e8ce94e97efe588d3
2021-05-14 02:41:23 +00:00
Tiffany Nguyen
77728801c2 Merge "Redirect battery-level settings preference clicks if needed" into sc-dev am: df8537269f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486116

Change-Id: Ib1ea395ab0df19f122828c475de3daead844f22e
2021-05-14 02:41:18 +00:00
Yanting Yang
542ba7477e Merge "Move DWB to the fifth position from the bottom on the homepage" into sc-dev 2021-05-14 02:37:12 +00:00
Edgar Wang
c6e0507f38 Fix work profile picker user icon didn't follow UX guideline
- Remove duplicated dimen in Settings

Fixes: 186609520
Test: manual & robotest
Change-Id: I256e4f75fe131449b2593d1a8cb422f122a943ac
2021-05-14 10:35:24 +08:00
Sunny Shao
1d4c5be0e9 Fixed extra padding in "Open by default" page
- Page layout redesign.

Bug: 184228266
Test: manual test
Change-Id: I1323ca14b1843a95ba1210674595ee3ba1a94c67
2021-05-14 10:26:06 +08:00
YUKAI HUNG
f70cb82b0c Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev 2021-05-14 02:21:38 +00:00
Tiffany Nguyen
df8537269f Merge "Redirect battery-level settings preference clicks if needed" into sc-dev 2021-05-14 01:46:53 +00:00
Kevin Chyn
0060445136 Merge changes I9dea35a7,Iddcc0a65 into sc-dev am: bcc288e801 am: 29366ad429
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14531459

Change-Id: I3b281e5d85207b2e32be068b9588cc17b0cf840e
2021-05-13 23:05:15 +00:00
Kevin Chyn
29366ad429 Merge changes I9dea35a7,Iddcc0a65 into sc-dev am: bcc288e801
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14531459

Change-Id: I5ee838be3b7763d4bb8c9d6eccc5e017c8d68cac
2021-05-13 22:43:55 +00:00
Julia Reynolds
cca752b350 Merge "Fix vertical alignment in history" into sc-dev am: 14f204af54 am: 494d01bd76
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14532408

Change-Id: I9cc40845711fe2dcbbb37be25e3d88224e25102a
2021-05-13 22:34:46 +00:00
Kevin Chyn
bcc288e801 Merge changes I9dea35a7,Iddcc0a65 into sc-dev
* changes:
  Update UDFPS "find sensor" string for a11y
  Update a few more strings
2021-05-13 22:27:59 +00:00
Julia Reynolds
62cf042047 Use | not , am: 78c4e70cf6 am: eeb455e63a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14534046

Change-Id: I36009af617d19f374e13335d2d9844818d7ffe75
2021-05-13 22:27:59 +00:00
Kevin Chyn
6a43df9855 Update UDFPS "find sensor" string for a11y
Bug: 187999176
Test: manual
Change-Id: I9dea35a70aba87f5f2cc94fc73e74a5a624019b9
2021-05-13 15:20:37 -07:00
Julia Reynolds
494d01bd76 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: I1ffaa33bd22f7ca281a089c454cecc7b12206cb2
2021-05-13 22:07:29 +00:00
Julia Reynolds
eeb455e63a Use | not , am: 78c4e70cf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14534046

Change-Id: I32fcde9c6d9af29c1e809a03257f2094582b6047
2021-05-13 22:06:39 +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
ab131311c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b7b6f180b -s ours am: 5ab07c89a2 -s ours am: 3d867d50f5 -s ours am: c092945258 -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: I2f822c8b27b494de02f7fbe154bd943aa2f6c4d8
2021-05-13 14:59:29 +00:00
Bill Yi
1f3e91e040 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 933340766b -s ours am: 64e44f83b9 -s ours am: df3c661db7 -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: I8723e0fdd17cf1609f5b6a825d0338587b48408f
2021-05-13 14:59:22 +00:00
Bill Yi
c092945258 [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: I78903f17a2a8a676a61b475b98131b3db87d8b16
2021-05-13 14:53:36 +00:00
Bill Yi
df3c661db7 [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: I12439d577fa263483bd018b2c845921e3ffa2122
2021-05-13 14:53:32 +00:00
TreeHugger Robot
80a863b4ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4cb355f8e5 -s ours am: 5d8ba6d5cd -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: I5add09d16146bf1426180c26a844a1a226a22482
2021-05-13 14:51:28 +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