Commit Graph

82345 Commits

Author SHA1 Message Date
TreeHugger Robot
0b246618f0 Merge "Fix test case failed" into sc-dev am: 6cd4ad46d2 am: 7dada139f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542669

Change-Id: Id3e428722c57c5cc26a01b768c3165c1126c65ac
2021-05-14 10:04:39 +00:00
Chiachang Wang
27130d5ce9 Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev am: 5613be1465 am: e5d4adc69e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518468

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

Change-Id: I9ede2d99ee515f1293af067496fc1695824b50ed
2021-05-14 10:03:28 +00:00
Stanley Wang
5d6410dbd6 Merge "Guard the NPE on StartNow slice" into sc-dev am: f7cb316cd2 am: 96431d2f81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515932

Change-Id: I57253a85e254a07856ebe4d799cc09a6259c1f49
2021-05-14 10:03:22 +00:00
TreeHugger Robot
7dada139f5 Merge "Fix test case failed" into sc-dev am: 6cd4ad46d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542669

Change-Id: I8e73e48e79036bb16405fab8d7199bb86bcdb4a5
2021-05-14 09:38:42 +00:00
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
TreeHugger Robot
6cd4ad46d2 Merge "Fix test case failed" into sc-dev 2021-05-14 09:35:18 +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
Hugh Chen
c7dbd26fbf Fix test case failed
Fix ConnectedDeviceDashboardFragmentTest test case failed.

Bug: 187999771
Test: make RunSettingsRoboTests -j56
Change-Id: I7c2617d1305c3e648f14ba8982d716ef1034e66e
2021-05-14 16:23:35 +08: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
094cfbd9af Merge "Add divider below ActionButtonPreference in BluetoothDetailFragment" into sc-dev am: f6712e330a am: 5c3a065926
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439452

Change-Id: Icbe7ae87dea82d64340f9c92bd6358f87952ab0c
2021-05-14 06:41:27 +00: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
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