ykhung
f49eaf54e6
Fix legacy failed unit test for BatteryInfoLoader
...
fix the legacy failed test since the scale is different, setting the
testing value in ms scale (getBatteryTimeRemainingMs()), but getting
the data in us scale (info.remainingTimeUs)
Bug: 188244142
Test: make SettingsRoboTests
Change-Id: Ib389976985eb3741cc96e0ee4a3a000c7f690b37
2021-05-17 06:19:09 +00:00
Arc Wang
6062b6491d
Rename audios to audio
...
Bug: 186635176
Test: build pass
Change-Id: I0d909f639fe36edf2e5088c7ec219cceee4e963a
2021-05-17 14:11:17 +08:00
Arc Wang
c0b5ba5225
Storage Settings shift profile selection tab position
...
In this change, Storage Settings main UI is composed by 3 fragments.
StorageDashboardFragment only shows when there is only personal profile for
current user.
ProfileSelectStorageFragment (controls preferences above profile tab) and
StorageDashboardNoHeaderFragment (controls preferences below profile tab)
only show when current user has installed work profile.
Bug: 174964885
Test: atest com.android.settings.deviceinfo
atest com.android.settings.deviceinfo.storage
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo
make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.deviceinfo.storage
Change-Id: I50dea2fbcae39a1488e648f3ca615f54840e19d5
2021-05-17 14:07:24 +08:00
TreeHugger Robot
63e5d424c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours am: 2332a37557 -s ours am: 0c847ab549 -s ours am: 7eee3839c9 -s ours am: bb837f1ec0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469856
Change-Id: I73b477950f96905732cf8e7d89c3a965fa4e9cf4
2021-05-17 06:02:13 +00:00
Bill Yi
61d5ef8d29
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours am: d32b02b4b4 -s ours am: 8d2d27953d -s ours am: 07eb180b1a -s ours am: 23c2c7dc7f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I33454fca3b0c3fc551e20e437dcf805065281f6e
2021-05-17 06:02:07 +00:00
TreeHugger Robot
fc61d31128
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436 -s ours am: fc9217fca5 -s ours am: b3c02e1811 -s ours am: af8c6c83da -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469644
Change-Id: Ia535ac639d4f240444d785b944ea53bcd736a433
2021-05-17 06:02:01 +00:00
Bill Yi
024a75dddc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d -s ours am: bd905bff88 -s ours am: cc4940cc2a -s ours am: e9e254a992 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469653
Change-Id: Ib3148ebf71a58939452b36ddbc569d817ad41a2b
2021-05-17 06:01:55 +00:00
TreeHugger Robot
443529b86a
Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev am: 0842cc9adc am: 4fbf1990bf am: 5bdef1f980
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463204
Change-Id: I9bfb63b8eb0521e41b0d0aec48ab57571172e836
2021-05-17 06:01:49 +00:00
ykhung
6679ca1870
Fix corner case IndexOutOfBound exception for null content am: bf5dd80d4f am: 985c9a3d42 am: 246884a4e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456006
Change-Id: Ibc349f4c59363063f09ebe2747c41c1ab2ec3dad
2021-05-17 06:01:42 +00:00
menghanli
79889460ae
Remove above divider of main switch
...
Problem: The main switch won't be the ceiling preference. It has chance to show the divider if another preference won't disable the below divider.
Solution: Remove the above divider.
Bug: 186066199
Test: Test: Manual testing
Change-Id: I49893fa71b016f82dce9f402d47c86ec3df20a54
2021-05-17 05:52:50 +00:00
menghanli
6be6377079
Fix “Learn more” link not working on Magnification shortcut page from Vision Settings
...
Root cause: It does not allow to start another activity before SuW
Completed. We should not show link for users.
Solution: Remove the link
Bug: 188034493
Test: Manual testing
Change-Id: I25d3eb3d02a2b992411ea7b73308f3e3503cd70a
2021-05-17 12:44:29 +08:00
Treehugger Robot
21c08903e2
Merge "Settings: remove Bluetooth related text from DNS-dialog" am: ca3051403f am: a786f86808
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708562
Change-Id: I87d9bdbe2743e45493ecd38d4aa7bd280593f9c3
2021-05-17 04:17:12 +00:00
Treehugger Robot
a786f86808
Merge "Settings: remove Bluetooth related text from DNS-dialog" am: ca3051403f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708562
Change-Id: Id142445ac2a16be54f0bbc8afdc9ce03b1676ea7
2021-05-17 03:51:53 +00:00
Treehugger Robot
ca3051403f
Merge "Settings: remove Bluetooth related text from DNS-dialog"
2021-05-17 03:19:59 +00:00
Silin Huang
c80b3ab718
Expose Lock screen settings page.
...
Test: atest
Bug: 188105349
Change-Id: I7646f712608076037634c26d2334de4367b4452b
2021-05-17 02:57:38 +00:00
Alex Stetson
a11ef76365
Merge "Use shared model for non-system overlay toggle" into sc-dev am: 413893244d am: 2f3826948a am: 74e9845ba2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441754
Change-Id: I625517766e3038a10263eae00fa5cf351429e54e
2021-05-17 02:43:10 +00:00
TreeHugger Robot
56313dcb81
Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05 am: adfbb68838 am: d4ddfe7496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999
Change-Id: I9167d8cffb12b21f83349fa799953c04d19c6671
2021-05-17 02:11:36 +00:00
TreeHugger Robot
b8c7782bc3
Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad am: 3fb211bc4e am: e2608c118b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000
Change-Id: I67a5cb100101fee0e67dacc1ad71aab7964b38e1
2021-05-17 02:11:30 +00:00
Yanting Yang
2d28b68e90
Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb am: f94fe0e86c am: aa904a9ea2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216
Change-Id: I67e045bad39b560777a1642f740df7cd0e5308c0
2021-05-17 02:11:24 +00:00
Syaoran Kuo
fbad14ff5a
Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05 am: 84dfab789e am: bdb5723002
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410
Change-Id: I8e85c46eb205c0f582ab55ec7dc512c9adb417e2
2021-05-17 02:11:17 +00:00
TreeHugger Robot
29882e1031
Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed am: 1b2bf94780 am: b2baeba56a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975
Change-Id: I6f2c8e95151bee24c11a00d49c9c60ed94ab33bf
2021-05-17 02:11:12 +00:00
Edgar Wang
d5e6cbab00
Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e am: 2b301c466f am: 116b57797b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874
Change-Id: Idab785fabeb96b5505e51459a51c2735857fe331
2021-05-17 02:11:05 +00:00
TreeHugger Robot
20771f8453
Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad am: 947f4d458a am: 3bfdd162a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997
Change-Id: If4ba7a42676c695237a0c56b9dc7aae728aedcae
2021-05-17 02:10:57 +00:00
Treehugger Robot
bc48f281c8
Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388 am: e24cba9b59 am: 151435a12f am: 3a39be999a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923
Change-Id: I046c881ceb1fa7de62b9c39ef23317498a385495
2021-05-17 02:10:37 +00:00
TreeHugger Robot
0c2baecbdf
Merge "Add require scrolling button for FingerprintEnrolling intro" into sc-dev am: b1b7029fa6 am: b829a124a1 am: 50073054dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441409
Change-Id: Ic74eacd0d60c6ad03a211e27c14526beb9019993
2021-05-17 02:03:39 +00:00
Betty Chang
bce38c31b1
Merge "Change Network detail string form TYPE to Type" into sc-dev am: 19f21656a1 am: f843e9f9f1 am: c041e2123f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441413
Change-Id: I9597345b6954ede79d20e1489a23fe4b45b5cb50
2021-05-17 02:03:33 +00:00
TreeHugger Robot
0b2527adeb
Merge "Adopt new battery history map with interpolation method" into sc-dev am: b7ffc45052 am: ceece92af2 am: 2cdb44cb6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441406
Change-Id: Ic440d822af85ebf9d518279549bac9d766877700
2021-05-17 02:03:27 +00:00
TreeHugger Robot
1674554eba
Merge "Refactor ChooseLockGenericController" into sc-dev am: b3b59d6edd am: fa9a904c1f am: 493da906c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14269154
Change-Id: I3a617b929dbb5922b0fe5c2ca7d10e11e72afd6a
2021-05-17 02:03:20 +00:00
Julia Reynolds
880972e58e
Merge "Update the theme for Notification history page" into sc-dev am: 7d3c283e27 am: ffde414545 am: c644ded2c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442218
Change-Id: I522f44e4b855e26311152d49165ca369acfc860b
2021-05-17 02:03:14 +00:00
TreeHugger Robot
c805d6fcc6
Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev am: bbb6562684 am: 7bb2eff8cc am: adcdff9e06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442217
Change-Id: I9dea05bfb7876beb3da5972a579301c8229198f9
2021-05-17 02:03:09 +00:00
Menghan Li
1e0b55e735
Merge "Fix Sound Amplifier does not have 'Open XXX' button" into sc-dev am: fa0ef8f2d9 am: a65e9a7ec5 am: fe33a799f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409965
Change-Id: Icdb4a4c0e12db30ea817c1425e043454bb1eb130
2021-05-17 02:03:04 +00:00
Menghan Li
167d8a41f9
Merge "Rename Tap assistance to Timing controls" into sc-dev am: 51fa8a290b am: 88df66be69 am: 800c75fadc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441407
Change-Id: I1fc39d9a93b40180ecce68f5b6d79a726bcf1555
2021-05-17 02:02:59 +00:00
Les Lee
a706580012
[automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 am: f38761e027 am: eb9ec7f664 -s ours am: 956fdad9c6 -s ours am: cf4980bcc4 -s ours am: 696d0ded3d -s ours
...
am skip reason: Merged-In Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb with SHA-1 26128e8722 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759
Change-Id: Ic1d806bc94c18556b7dfd460ede92da163cba87c
2021-05-17 02:02:54 +00:00
TreeHugger Robot
58cb2a14fc
Merge "Fix the section below "Pair new device" moves up a few pixels" into sc-dev am: e6b78a5ada am: 6d44c61935 am: 5e3232cc63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319866
Change-Id: Ia2cc2d741ea181a9334e1645acb9bd8a5c6dea74
2021-05-17 02:02:47 +00:00
TreeHugger Robot
900c11ca2b
[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fdcf96ee99 -s ours am: 2c8ed65745 -s ours am: 461b72cdc7 -s ours am: fd730ef2de -s ours am: 0f49602b97 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352145
Change-Id: I30b3576a709af8bbd45fbf84e54f11542bfb0754
2021-05-17 02:02:41 +00:00
TreeHugger Robot
872c0843b9
[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b -s ours am: fd32dc93c9 -s ours am: 2c30777afa -s ours am: 4ec5a7dbbb -s ours am: 7e80ecd04c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352145
Change-Id: Ice8c4748f7f2428ca59f4a57f1bb9139ee16eb97
2021-05-17 02:02:36 +00:00
Yi Jiang
0aada9a5e5
Merge "Fixes NPE in Screen attention setting" into sc-dev am: d0af03e11c am: 9760064c72 am: 1f2288ca74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443109
Change-Id: Ia5b2996c40d820f6b264c92f2687e0461a5b822d
2021-05-17 02:02:31 +00:00
TreeHugger Robot
2a9a7082a6
Merge "Fix color filling on some Wifi pages" into sc-dev am: b720318fd3 am: 5fa9ab1487 am: 7bb935fc56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439324
Change-Id: Ia0cd880404867ea275f2ae9edbfbdeb29ca98377
2021-05-17 02:02:25 +00:00
TreeHugger Robot
6da0c3edc2
Merge "Fix loading ring overlapping problem" into sc-dev am: dff47cf00a am: 6cb46f5164 am: 79763c378b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439454
Change-Id: I98595eecbf6b8584625ede1bb8a08fb67919a755
2021-05-17 02:02:19 +00:00
TreeHugger Robot
5b0ac52f4b
Merge "Update battery settings string" into sc-dev am: 1ae9a706ff am: 4b3f704b88 am: 55fda06d50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439450
Change-Id: Ic42426004358105b2677d4e6e0a73a6c2fe12506
2021-05-17 02:02:14 +00:00
YUKAI HUNG
7d80ea8afb
Merge "Add abnormal interpolation info to log unexpected conditions" into sc-dev am: b3267fb2ea am: db779776cb am: ae7ff5041c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439969
Change-Id: I292af31f28d357aab6072cc6d895c1f8187ff6b4
2021-05-17 02:02:08 +00:00
TreeHugger Robot
da8b5250ac
Merge "Fix searching condition for biometric settings" into sc-dev am: a75ba398fe am: 55be0e9053 am: c92abc116c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439453
Change-Id: I571b589725ce67a95c88e0188e91be11807988a5
2021-05-17 02:02:03 +00:00
Jason Hsu
150f5b8046
Merge "Align dark theme in accessibility page with the dark theme in display page." into sc-dev am: 8caef2218c am: 7649fa90f7 am: f39be2afea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408669
Change-Id: I3eb63a3861875adaa74764b1c7142893acff8642
2021-05-17 02:01:56 +00:00
TreeHugger Robot
14f582518c
Merge "Update Prevent Ringing summary when it turn off" into sc-dev am: 3aca460dfc am: 17877ef23e am: 400cca93b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442220
Change-Id: Idae60cf9ed442292c34e4f275bfb089f3d5519fd
2021-05-17 02:01:27 +00:00
Les Lee
30382edd13
Merge "wifi: Use new API for wifi data usage function" into sc-dev am: 0dc1ee01f8 am: a9ca9bec05 am: f7f80cbec2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419446
Change-Id: I65c8b92f376233bf1ae7baa47ba114d9079a7df5
2021-05-17 02:01:21 +00:00
TreeHugger Robot
ca2de74aa2
Merge "[Provider Model] Fix settings crash issue" into sc-dev am: f396c0af28 am: e6e27e32bb am: 6c1e450359
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439968
Change-Id: I0f5719c0263b616d98c27fc40e1dcbd776659377
2021-05-17 02:01:16 +00:00
Weng Su
9d39fe823c
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 am: 2e9640d5b0 am: e304f37927 -s ours am: 2f3389ff0c -s ours am: b43f98b65c -s ours am: 2452d722e9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I30a1b091e63d0c872c4b88019659a2eb286edb8a
2021-05-17 02:01:10 +00:00
Jeremy Goldman
0813cef811
Merge "Create unit test for the VpnInfoPreference" into sc-dev am: 0a6a6269e3 am: 8c07c41e73 am: 0f8711450b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436936
Change-Id: I045c2cfcd9be0a9d592d3a5f70a92ed0b7fb069d
2021-05-17 02:01:05 +00:00
Weng Su
38e0de32f0
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968 am: 632eb0d54a -s ours am: 41b7d11496 am: 7a8de548ce -s ours am: 6e761235fd am: a2b6fa6d46 am: 312e7f028d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I36e1d815d573c52b78dc258fe5e1628c1b163749
2021-05-17 02:00:56 +00:00
TreeHugger Robot
0480994a5f
Merge "Add new constructor to create BatteryHistEntry from interpolation" into sc-dev am: f9ebf6600f am: a5d73fdde8 am: d334d18b59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14436937
Change-Id: I08b3d2f0b2f586af4f75f913b5fb1d0648ec62a9
2021-05-17 00:54:51 +00:00