Commit Graph

82105 Commits

Author SHA1 Message Date
Chiachang Wang
e5d4adc69e Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev am: 5613be1465
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518468

Change-Id: Ic7941313cb8d84a85cb7442b0d2964b6092b620c
2021-05-14 09:38:13 +00:00
TreeHugger Robot
9fce90e953 Merge "Wrap generating battery history keys into another method" into sc-dev am: 5c2a472b39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542665

Change-Id: Iefde1d1d782fcd046ebf19f650f317a53113750b
2021-05-14 09:37:50 +00:00
Chiachang Wang
5613be1465 Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev 2021-05-14 09:32:42 +00:00
TreeHugger Robot
5c2a472b39 Merge "Wrap generating battery history keys into another method" into sc-dev 2021-05-14 08:42:54 +00:00
Stanley Wang
96431d2f81 Merge "Guard the NPE on StartNow slice" into sc-dev am: f7cb316cd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515932

Change-Id: I73d55bc733ea2176c7416fa986f8da78eb264f5b
2021-05-14 08:17:01 +00:00
Stanley Wang
f7cb316cd2 Merge "Guard the NPE on StartNow slice" into sc-dev 2021-05-14 07:39:38 +00:00
Stanley Wang
f2c664abd9 Guard the NPE on StartNow slice
Check if preference is null to avoid NPE when the StartNowPreferenceController
is called by slice.

Fixes: 187806890
Test: robotest
Change-Id: I84c1ee42bc1fd87dd720061e3af81e926028181d
2021-05-14 07:38:41 +00:00
ykhung
637d34ed71 Wrap generating battery history keys into another method
Bug: 188123855
Test: make SettingsRoboTests
Change-Id: I82a48e66ec4f7b4c0d9a6756799aa8d7a3a96848
2021-05-14 07:21:09 +00:00
Chiachang Wang
6a78464406 Replace clearAll with withoutDefaultCapabilities
Replace the API as the feedback from API review.

Bug: 184735772
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=ContextualWifiSliceTest

Change-Id: I18f0776b6522489bf7e88f984bc44f23d8c9edc4
2021-05-14 15:08:00 +08:00
TreeHugger Robot
5c3a065926 Merge "Add divider below ActionButtonPreference in BluetoothDetailFragment" into sc-dev am: f6712e330a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439452

Change-Id: I5ecd7915b007d3103518ef4348efd3659228cc98
2021-05-14 06:27:27 +00:00
TreeHugger Robot
f6712e330a Merge "Add divider below ActionButtonPreference in BluetoothDetailFragment" into sc-dev 2021-05-14 06:12:41 +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
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
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
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
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
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
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
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
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
5d8ba6d5cd [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: I845e539008938f806b14ec918ba827a02a69d3bc
2021-05-13 14:31:35 +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