Commit Graph

81228 Commits

Author SHA1 Message Date
TreeHugger Robot
f28ca844e2 Merge "Use "Passwords & accounts" instead of "Passwords and accounts"" into sc-dev am: 76193c0bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111131

Change-Id: I270933a1ad9587b0959f0f509acf8c0dc25c1399
2021-04-08 01:57:44 +00:00
Jeremy Goldman
e40adc1256 Merge "Subscription name has whitespace trimmed to determine uniqueness" into sc-dev am: b71cb56c05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111129

Change-Id: I1909fbef2fa23cdbd98311399226444b93ef92ee
2021-04-08 01:56:53 +00:00
TreeHugger Robot
76193c0bea Merge "Use "Passwords & accounts" instead of "Passwords and accounts"" into sc-dev 2021-04-08 01:48:55 +00:00
Jeremy Goldman
b71cb56c05 Merge "Subscription name has whitespace trimmed to determine uniqueness" into sc-dev 2021-04-08 01:16:14 +00:00
TreeHugger Robot
2f4bf4d98e Merge "Add a divider line in safety settings" into sc-dev am: 08affe5365
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114426

Change-Id: Ib8ae8600a92e806247478dd4c4b08d3071927a8b
2021-04-08 00:10:45 +00:00
TreeHugger Robot
08affe5365 Merge "Add a divider line in safety settings" into sc-dev 2021-04-07 22:07:20 +00:00
Fan Zhang
eee07aacb9 Add icon to "Open [safety app] button
https://screenshot.googleplex.com/AjFhMECtQ4E9QAa.png

Bug: 184261824
Test: manual
Change-Id: I2b9b74077aec29dee3a34105584c5364fa663a84
2021-04-07 20:29:23 +00:00
TreeHugger Robot
8271bc0bdd Merge "Mark non actionable preferences as non-selectable" into sc-dev am: ec7c17c3cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114141

Change-Id: I3a362429516d6a8ccd0469b6bde031f6f05cba6d
2021-04-07 20:28:33 +00:00
Almaz Mingaleev
7a69305f52 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144 am: 90d5572fa5 am: f3a44236e3 am: 18c9ff9bd2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: I3105cfb41f112c8efd5122fd74008615281d1947
2021-04-07 20:05:40 +00:00
TreeHugger Robot
ec7c17c3cd Merge "Mark non actionable preferences as non-selectable" into sc-dev 2021-04-07 19:55:34 +00:00
sallyyuen
ee9cb2d147 Get Extra Dim availability through ColorDisplayManager
Test: atest ReduceBrightColorsIntensityPreferenceControllerTest
Bug: 170970675
Change-Id: Ibccca13d6491e8861263887e33021dd467fc227f
2021-04-07 12:30:11 -07:00
Almaz Mingaleev
18c9ff9bd2 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144 am: 90d5572fa5 am: f3a44236e3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: I3f3ce9f7dc0528e492473dcf1f8344f0518119e1
2021-04-07 19:28:22 +00:00
Bonian Chen
84d3218d41 Merge "[Settings] More log to help analysis" into sc-dev am: 44a45f0c49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103370

Change-Id: I178dc11e6d307bf47e44116b2b042fd69ad446d0
2021-04-07 19:07:48 +00:00
YUKAI HUNG
eddecea320 Merge "Remove options menu from BatteryUsage to align material next" into sc-dev am: 8477cf1892
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14112967

Change-Id: I655119306c554c9ea73dbc1bff83d3765cbe48f4
2021-04-07 19:07:17 +00:00
Abel Tesfaye
91b0d960b4 Merge "Add warning message when camera privacy lock is enabled for smart auto rotate settings fragment" into sc-dev am: 28ad67dac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13857227

Change-Id: I551a3fb59fb2ec8cc7399ff371cd4c6ad1707908
2021-04-07 19:06:12 +00:00
Fan Zhang
209f2daeaf Add a divider line in safety settings
https: //screenshot.googleplex.com/BmYJmftnAF354GY.png

Bug: 184261824
Test: manual
Change-Id: I67223f2811c0bf9a738ad3aedcbcff1f00749641
2021-04-07 19:05:32 +00:00
Almaz Mingaleev
f3a44236e3 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144 am: 90d5572fa5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: I75ef99ef2f008e98c12642c442e94f7daf860f69
2021-04-07 19:03:43 +00:00
Julia Reynolds
14cdcfdee9 Mark non actionable preferences as non-selectable
Test: navigate the conversations page with switch access enabled
Fixes: 178765656
Change-Id: If5d5dd301e2d95b4aa7512f58a6e1adf01f3dbf0
2021-04-07 14:35:39 -04:00
Bonian Chen
44a45f0c49 Merge "[Settings] More log to help analysis" into sc-dev 2021-04-07 18:11:32 +00:00
YUKAI HUNG
8477cf1892 Merge "Remove options menu from BatteryUsage to align material next" into sc-dev 2021-04-07 17:17:04 +00:00
Abel Tesfaye
28ad67dac2 Merge "Add warning message when camera privacy lock is enabled for smart auto rotate settings fragment" into sc-dev 2021-04-07 17:13:44 +00:00
Almaz Mingaleev
90d5572fa5 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001

Change-Id: Ia7c9b9c683429dcb51b79c57d745c7763a888721
2021-04-07 16:55:48 +00:00
Almaz Mingaleev
e3d4e39144 Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." 2021-04-07 16:19:33 +00:00
Bonian Chen
998554d68f [Settings] More log to help analysis
Add log for supporting issue analysis.

Bug: 184602966
Test: local
Change-Id: I739ac827e0da1caca045e88599fafb293e25b65c
2021-04-07 16:12:38 +00:00
ykhung
48dce3c0b7 Remove options menu from BatteryUsage to align material next
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I846668283d8c210f3b30fcf8c0ba5949588310d3
2021-04-07 16:03:34 +00:00
YUKAI HUNG
909832b33d Merge "Remove the current battery usage chart and replace it with new one" into sc-dev am: babe3b0e73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111128

Change-Id: I1680fd23d614d6f9c001069dcabc8f6d27646b36
2021-04-07 15:31:12 +00:00
YUKAI HUNG
babe3b0e73 Merge "Remove the current battery usage chart and replace it with new one" into sc-dev 2021-04-07 14:57:47 +00:00
TreeHugger Robot
c5991233b2 Merge "Fix ANR on ShorcutManager#getPinnedShortcuts" into sc-dev am: 82b44b24cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14100762

Change-Id: Ic84f3eb554122ddd6c615a025f4051a8b05c128b
2021-04-07 12:44:49 +00:00
TreeHugger Robot
9fca11053f Merge "Fix AddNetworkFragment bottom buttons position problem" into sc-dev am: 97e98f0e44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14110465

Change-Id: I6cc37ecd77778c2abc9e5148056fca42c444432d
2021-04-07 12:44:44 +00:00
tim peng
94b467bb83 Merge "BTHS will have no sound after disable HD audio" into sc-dev am: 49244d8075
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14065246

Change-Id: I6906e3507b89cb6f879fe2ada1361cd12186058f
2021-04-07 12:44:38 +00:00
TreeHugger Robot
82b44b24cf Merge "Fix ANR on ShorcutManager#getPinnedShortcuts" into sc-dev 2021-04-07 12:43:23 +00:00
TreeHugger Robot
97e98f0e44 Merge "Fix AddNetworkFragment bottom buttons position problem" into sc-dev 2021-04-07 12:38:14 +00:00
Arc Wang
741c1e4298 Pop up soft keyboard when rename dialog shows
Request focus for the EditText.

Bug: 184710864
Test: manual
      At Storage Settings, select USB drive -> option menu
      -> Rename. Observe if soft keyboard pops up.
Change-Id: Ia73829ee505c94a255306bd817d01b6bc1b80e26
2021-04-07 20:34:12 +08:00
tim peng
49244d8075 Merge "BTHS will have no sound after disable HD audio" into sc-dev 2021-04-07 12:26:15 +00:00
Treehugger Robot
8c06cd318e [automerger skipped] Merge "Modify the value of intent-filter" am: 15ecc3610d am: e7ff215244 am: 53fa14267f -s ours am: 3b71dd2042 -s ours
am skip reason: skip tag Change-Id I40dfeec1c25cd549bbe5559e3c3ce21813fbf922 with SHA-1 aaf21230a1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579989

Change-Id: I40c21835b51b7f4c1c7a943a670a499181b7b981
2021-04-07 12:24:23 +00:00
Wesley.CW Wang
610c1a32f0 Update StringUtil#formatElapsedTime method (2/3) am: 50f314e45d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14063748

Change-Id: Ibfbc4d0469ef1ed5f0b213d3c2b0d19d1697e70f
2021-04-07 12:22:48 +00:00
Arc Wang
24fe5922de Sets Storage Settings progress bar unselectable
Since it does nothing if users click it.

Bug: 184712147
Test: manual
Change-Id: I7d243ad465a5fa3f23297ac80c82bef4d078e34a
2021-04-07 20:13:36 +08:00
Treehugger Robot
3b71dd2042 [automerger skipped] Merge "Modify the value of intent-filter" am: 15ecc3610d am: e7ff215244 am: 53fa14267f -s ours
am skip reason: skip tag Change-Id I40dfeec1c25cd549bbe5559e3c3ce21813fbf922 with SHA-1 aaf21230a1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579989

Change-Id: Ic1f8a90abc0092cfd0c96e5863b48d50c9d4539f
2021-04-07 12:06:15 +00:00
ykhung
1599313caf Remove the current battery usage chart and replace it with new one
Bug: 183921876
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I06f0eb5c09d07a9db0d1a93cda751e8fad672c79
2021-04-07 11:52:16 +00:00
Treehugger Robot
53fa14267f Merge "Modify the value of intent-filter" am: 15ecc3610d am: e7ff215244
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579989

Change-Id: If539b29f4ebdcdac637fb8ff61e1752de5af5cd2
2021-04-07 11:25:59 +00:00
Treehugger Robot
e7ff215244 Merge "Modify the value of intent-filter" am: 15ecc3610d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579989

Change-Id: Ic58bf302f23ae363d22a3ca7b636c9586dc04364
2021-04-07 10:42:47 +00:00
Wesley.CW Wang
50f314e45d Update StringUtil#formatElapsedTime method (2/3)
- Update the usage and the test case
 - Update discharging string to follow new string doc

Bug: 183689347
Test: make RunSettingsRoboTests
Change-Id: I1e14e7da8cb02755d8cf6e12626a0d94fad87121
2021-04-07 10:19:10 +00:00
Treehugger Robot
15ecc3610d Merge "Modify the value of intent-filter" 2021-04-07 10:11:06 +00:00
TreeHugger Robot
135bca46ac Merge "Refine the summary of "Open by default" in "App info" page" into sc-dev am: acacad4cdf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14100754

Change-Id: Iffbddf663d4acac38b3180061c0e34d812d69d26
2021-04-07 09:56:51 +00:00
TreeHugger Robot
ea58000b91 Merge "Maximize compatibility string update" into sc-dev am: 437e7e7a04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103365

Change-Id: Ib1ce50e8a05d02acaa2031ce6d5ca170bd8b27ca
2021-04-07 09:56:46 +00:00
TreeHugger Robot
acacad4cdf Merge "Refine the summary of "Open by default" in "App info" page" into sc-dev 2021-04-07 09:26:24 +00:00
TreeHugger Robot
437e7e7a04 Merge "Maximize compatibility string update" into sc-dev 2021-04-07 09:24:44 +00:00
Jeremy Goldman
d62b2c23cf Update string associated with Connected, Always On or Insecure VPNs
Previously these strings were separated with a comma, but the new design
is to separate them with a "/" and to not include always-on information
if the vpn is also insecure.

Comment thread on the strings doc: https://docs.google.com/document/d/1hjaYuGmvNzCKPOrmjixpmLLXBV8cbxgrZ3eN4KvC4E8/edit?resourcekey=0-zo7B2GVc9luQTut0o8THNA&hl=zh-TW&forcehl=1&disco=AAAAIF3eiQY
screenshot: https://screenshot.googleplex.com/BmBroUZtmUPJz9s
Test: atest -c SettingsUnitTests
Bug: 176821216

Change-Id: Ib9c273de61c9722b0beb6fba127e7481e6c64705
2021-04-07 17:04:13 +08:00
Sunny Shao
fe885c96c1 Use "Passwords & accounts" instead of "Passwords and accounts"
Bug: 184713810
Test: manual test
Change-Id: I48a7ae4f89b2a1df76254978173949ba463ed4a7
2021-04-07 16:58:17 +08:00
Ryan Lin
0f4ee3464c Merge "Change illustrations of Magnification Settings" into sc-dev am: 7bb5b8f326
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14098543

Change-Id: I45a908855bf96ea4b0c88aa5ac99f464636ff679
2021-04-07 08:33:34 +00:00