Commit Graph

81924 Commits

Author SHA1 Message Date
TreeHugger Robot
f23409f7e5 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev am: 0174c4bad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515925

Change-Id: Ie28332bef31c7671d6b794c7d82c8958f788d66a
2021-05-14 10:02:29 +00:00
TreeHugger Robot
66fa924dfa Merge "Fix foreground Service background launch restriction" into sc-dev am: 7c50995261
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542667

Change-Id: I7ad2e5dabc09d026665bc532da83a8fa7bd2fba6
2021-05-14 10:02:23 +00:00
TreeHugger Robot
0174c4bad0 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev 2021-05-14 09:59:54 +00:00
TreeHugger Robot
7c50995261 Merge "Fix foreground Service background launch restriction" into sc-dev 2021-05-14 09:54:12 +00:00
TreeHugger Robot
98c966412b 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: I4911fc240d2c49525c91f6dd3988c04179ff4cc8
2021-05-14 09:37:31 +00:00
Chiachang Wang
2f17b57a66 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: I2a61d88bc97d4a26d10b58a80f2ea4ac90b84a5f
2021-05-14 09:36:55 +00:00
TreeHugger Robot
2ba9a9df13 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: I86875d298a45b0b5f30f857d2e876e2eef778aa3
2021-05-14 09:36:40 +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
Tim Peng
6cbeb65a05 [Rohan] Two battery level, but no charging status in Rohan Setting
-show/hide battery information by device type

Bug: 187692468
Test: atest AdvancedBluetoothDetailsHeaderControllerTest

Change-Id: I22b4f2cddaf1143dd48ffec2fa3114d685689633
2021-05-14 16:55:05 +08:00
Hugh Chen
3eb374adb4 Fix foreground Service background launch restriction
Remove setForeground() in BluetoothPairingService. Refactor
the behavior to not holding service in the background.

Bug: 184901840
Test: make RunSettingsRoboTests -j56
Change-Id: Iaeb96943971f55dbeb3dba4b06b28abe770ba3c2
2021-05-14 08:53:14 +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
977150fcbf 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: Ida0c85f7bf9968521bf0d3b3d02cb4d447a848c6
2021-05-14 08:15:20 +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
92587df7cc 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: I7add2a8b6fa29edb7d94c0b708716aea39b3c063
2021-05-14 06:24:45 +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
9969d158a6 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: I287012303a3accbad4cbe36bc85f0eb64f68a770
2021-05-14 05:22:55 +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
cef1f2c20c 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: I5fbdb71d634b4729453485c9641911b2c9fa6aa4
2021-05-14 04:33:32 +00:00
TreeHugger Robot
ac21d38d3a 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: Ibc8307713676c3a8bf26282265feb1e297ed1eb4
2021-05-14 04:33:12 +00:00
TreeHugger Robot
b970beb0c3 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: Iada261df5039a3e624c37fb738faa057e203844f
2021-05-14 04:30:47 +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
66ad8fd2c0 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: Ide6578a355c08e06d187ca0e572164f7ef390869
2021-05-14 02:53:33 +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
e01099b245 Merge "Remove the divider above footer in Gesture Navigation Settings" into sc-dev 2021-05-14 02:42:43 +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
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
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
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
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