Commit Graph

84901 Commits

Author SHA1 Message Date
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
82e91de6ca 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: Ia4880b03a5e5c200e2449144d1b7f4f386710f52
2021-05-14 02:39:57 +00:00
YUKAI HUNG
d2042cf5ab 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: I026cdad211584f35d4f2dec457c88c5eec76942c
2021-05-14 02:39:47 +00:00
Yanting Yang
7d3c434500 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: I95be00859aaa34a45645aa8c0d71a34f93f81f14
2021-05-14 02:39:39 +00:00
YUKAI HUNG
a9bdd91f19 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: Ief6ab1b26d456036583b4a17be894669575d2907
2021-05-14 02:39:31 +00:00
Tiffany Nguyen
e2ab30f348 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: I2ef953d6b3bb696105109e0ba38003f9c739540f
2021-05-14 02:38:48 +00:00
Tiffany Nguyen
fbcb0afdff 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: Ia1d5d00c1bf2f39d2bd314510ab85e2fa70f63f2
2021-05-14 02:38:45 +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
dbdaa8518a Fingerprint image is not important for a11y announcements
Fixes: 187338706
Test: manual
Change-Id: Ic0eac21d0265b5fceb0ab71e013932d3629645b3
2021-05-13 16:38:01 -07: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
Abel Tesfaye
44593a8922 Fix issue where smart auto rotate toggle is not disabled
Bug: 187755019

Test: locally on flame, make RunSettingsRoboTests -j96 ROBOTEST_FILTER=SmartAutoRotateControllerTest
Change-Id: I44bbd644515d153c834533fe47b3b2c34cfeaac6
2021-05-13 22:55:06 +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
Kevin Chyn
ecef0cd069 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: Ib5b919f508d81aa856e78d4cb07dbc44b2739875
2021-05-13 22:42:04 +00:00
Kevin Chyn
80bdfdceb4 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: Ib9e93bcdbfd52c486ceb8f459e4bf764aff501d4
2021-05-13 22:42:04 +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
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
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
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
b7aed2e7e4 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: I959b1b5750fac6008d53f8daa8b5373d42421dd6
2021-05-13 22:07:12 +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
51ea795f92 Use | not , am: 78c4e70cf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14534046

Change-Id: I583bb2e74c40bb293f64ccc5662d949a5f919a9d
2021-05-13 22:05:54 +00:00
Julia Reynolds
b1d00f88f5 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: I39b8d04822e95b6447a5a7d8a9904af8eced70b1
2021-05-13 22:05:34 +00:00
Julia Reynolds
afb60352f2 Use | not , am: 78c4e70cf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14534046

Change-Id: I750b888cd635376a8c975e919ad1895588684082
2021-05-13 22:05:18 +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
Bill Yi
d13933ce33 [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: I71f52e7aef73b06b155dc0fd33c089d0bc900830
2021-05-13 14:51:48 +00:00
Bill Yi
2aacefeeab [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: Ie62bfcfe2bc5b45bbed7aacda0e6d063ff7e61de
2021-05-13 14:51: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
70256e36a0 [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: Idd9b1d34717b992946aa33ef16de466219e0a75a
2021-05-13 14:51:13 +00:00
Bill Yi
e8fbeaa41c [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: I240afbbf564eba30e522cc2e099a0de05aeff68a
2021-05-13 14:51:00 +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
7cc8b89b68 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-13 14:36:36 +00:00