TreeHugger Robot
148bdb9e65
Merge "Filter out SecuritySettings search results when alternative available." into sc-dev am: 8355121c28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14548182
Change-Id: I060170b10d230cd153d678b1e9c26c6ef56124d1
2021-05-14 19:50:34 +00:00
TreeHugger Robot
8355121c28
Merge "Filter out SecuritySettings search results when alternative available." into sc-dev
2021-05-14 19:33:01 +00:00
Yanting Yang
802af0f016
Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202
Change-Id: Ic18f30f5f10d2e75d3f9aab119666ecc82091383
2021-05-14 18:34:37 +00:00
Yanting Yang
89cd044bd7
Merge "Remove silky flag from homepage for official release" into sc-dev
2021-05-14 18:13:29 +00:00
YUKAI HUNG
65b5d9706e
Merge "Add battery usage metric" into sc-dev am: d2d7d89de6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065
Change-Id: I4a45edac90e4291bf32656f0944b5fa6a63fb3fd
2021-05-14 17:47:09 +00:00
YUKAI HUNG
d2d7d89de6
Merge "Add battery usage metric" into sc-dev
2021-05-14 17:22:10 +00:00
Abel Tesfaye
c045fb64e6
Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137
Change-Id: Idf4555fc69ce3789881932482d701346a8935536
2021-05-14 16:12:22 +00:00
Abel Tesfaye
c077b490f4
Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev
2021-05-14 15:55:01 +00:00
ykhung
1ec8f04feb
Add battery usage metric
...
Bug: 188046672
Test: make SettingsRoboTests
Change-Id: I1716913eee7c93cafd622052dcbca940c9726a17
2021-05-14 14:18:55 +00:00
Arc Wang
17b52da448
Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev am: 20d45cc6f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519528
Change-Id: I52c854da8e487abb439d242730dd81994f94a16a
2021-05-14 13:13:34 +00:00
Arc Wang
20d45cc6f2
Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev
2021-05-14 12:58:36 +00:00
Jan Tomljanovic
e6070f9f0e
Filter out SecuritySettings search results when alternative available.
...
When alternative fragment is shown for the security settings page, we
don't want to show search results that would lead to an unused security
settings page.
Test: manual
Test: atest SettingsUnitTests
Test: make RunSettingsRoboTests -j
Bug: 184613149
Change-Id: I525bd87d1ac6a24a7a26f59ae917e35ac39732e3
2021-05-14 11:52:12 +01:00
TreeHugger Robot
e0ec97aa7b
Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev am: 5af530a054
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542668
Change-Id: I2a7e8610bf08ecc04bb6b8c074c65f4e553bb2d1
2021-05-14 10:26:10 +00:00
TreeHugger Robot
5af530a054
Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev
2021-05-14 10:18:46 +00:00
YUKAI HUNG
0af80557f5
Merge "Export a method for app info page to get last 24 battery history data" into sc-dev am: abd364e1f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542666
Change-Id: I796b670e161b2aecadf7fd9467ca31658226a1c1
2021-05-14 10:15:38 +00:00
YUKAI HUNG
abd364e1f3
Merge "Export a method for app info page to get last 24 battery history data" into sc-dev
2021-05-14 10:11:28 +00:00
TreeHugger Robot
ddc25f4d59
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: I300cff11f9e2a503c3e05788a9de9c5e2cab67bc
2021-05-14 10:03:18 +00:00
TreeHugger Robot
c62398d25b
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: Icc1f6337114d35e1fc8e4eb1f8573a9cfec1ca79
2021-05-14 10:03:10 +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
Yanting Yang
be4c5f078f
Remove silky flag from homepage for official release
...
Remove the silky condition and clean up redundant files.
Bug: 183670633
Test: robotests & visual with turning on/off silky home
Change-Id: I9259108534935ed8551748b922098dd52043afc1
2021-05-14 17:52:53 +08:00
TreeHugger Robot
08eb23954c
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: If3946af373bfc92875e11d9a7a007823095a717a
2021-05-14 09:36:21 +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
ykhung
e8d1374ea2
Export a method for app info page to get last 24 battery history data
...
Bug: 188123855
Test: make SettingsRoboTests
Change-Id: I1953461c47a33c5951b94726e6eade21033a1403
2021-05-14 08:36:52 +00:00
Stanley Wang
7ce00ee003
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: I8348206ad6d496b47a56015dcf758d0b42acb58a
2021-05-14 08:15:19 +00:00
Yi-Ling Chuang
3e9c576bb8
Apply transition on the back arrow on NotificationHistory page
...
When clicking on the back arrow from the action bar in the Notification
History page, the shared x-axis transition won't work.
The onOptionsItemSelected() overriden in the parent activity was
removed, so onNavigateUp() will get called. In the
NotificationHistoryActivity, onNavigateUp() has been overriden, and so
it will just call finish without any transition applied.
Hence, remove the override and just use the one define in
CollapsingToolbarBaseActivity where finishAfterTransition() is called.
Test: rebuild and click on the back arrow to see the transition
Fixes: 188126675
Change-Id: I34ff38ffcfb37d0471d325f2c31b726809fbd91f
2021-05-14 16:11:03 +08: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
TreeHugger Robot
43be7a468f
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: I87bb0f268b072a134a5283675148539e436a3e8f
2021-05-14 04:32:41 +00:00
TreeHugger Robot
81989a5c2b
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: Ibd92edc60446b436589a939c10cdc6710497b8c3
2021-05-14 04:32: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
8b9f1d4f9e
Merge "Fixed extra padding in "Open by default" page" into sc-dev
2021-05-14 03:57:18 +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
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
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
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
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
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
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
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
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
78c4e70cf6
Use | not ,
...
To match similar APIs
Test: Settings unit
Bug: 181175697
Change-Id: I2ef56528da7a3d5b2c96be8ecfad1a3d6590bbe4
2021-05-13 19:24:17 +00: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