Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,261 Commits 1 Branch 0 Tags
563e020a6ee486be13a7c73007d93d10150fc6ff
Commit Graph

22719 Commits

Author SHA1 Message Date
Abel Tesfaye
3898988def Merge "Add warning message when camera privacy lock is enabled for screen attention settings" into sc-dev am: 473fffa318 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13989325

Change-Id: Ib11826a5270b887799fee54fe99dd45b4039ee66
 2021-04-09 17:07:57 +00:00
Abel Tesfaye
473fffa318 Merge "Add warning message when camera privacy lock is enabled for screen attention settings" into sc-dev 2021-04-09 16:31:36 +00:00
Rubin Xu
570b3c6dc6 Merge "Update titles & messages for password enrolment flows" into sc-dev am: 2f03bda6a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14018665

Change-Id: I8d90ea4f1169e1ba4874ef474459e5d47c55355a
 2021-04-09 15:18:51 +00:00
Rubin Xu
1ac05237ab Update titles & messages for password enrolment flows 
Show different titles and description messages when
enrolling password under various conditions:
* personal lock verus work lock
* adding a new lock versus updating existing lock
* enrolling a PIN verus password versus pattern

Add icons to options in screen lock picker.

Add an option to redirect to work lock flow if the admin
has set device-wide password requirement.

Bug: 183922696
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I40417b113814659d3226a44eb7f9d553386e3c58
 2021-04-09 14:35:36 +01:00
Wesley Wang
5c579ac280 Merge "Support help message when battery is unavailable(1/2)" into sc-dev am: 57f27f7a30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124308

Change-Id: Ia2e689df96523cb9f77ab293e1e28426f60efaf3
 2021-04-09 05:13:33 +00:00
Wesley Wang
57f27f7a30 Merge "Support help message when battery is unavailable(1/2)" into sc-dev 2021-04-09 04:43:06 +00:00
TreeHugger Robot
699dff5ed6 Merge "Add icons to Manage location services and App location permissions" into sc-dev am: 036a0c8877 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14102791

Change-Id: I5483b01e164588d8c39aed15d5310577ab753d35
 2021-04-09 04:05:49 +00:00
TreeHugger Robot
036a0c8877 Merge "Add icons to Manage location services and App location permissions" into sc-dev 2021-04-09 03:51:39 +00:00
Wesley.CW Wang
756028aadd Support help message when battery is unavailable(1/2) 
- Present help preference when battery is unavailable

Bug: 179237551
Test: make SettingsRoboTests
Change-Id: If6e82210d831123cb1169d53a18d24cb2c576b10
 2021-04-09 11:24:51 +08:00
Fan Zhang
6bdc95e4f8 Merge "Update emergency gesture settings string" into sc-dev am: b6e8a1ca22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14128298

Change-Id: I8bc0eca5658892a6294581c60e9abaa412778d19
 2021-04-09 00:37:21 +00:00
Fan Zhang
b6e8a1ca22 Merge "Update emergency gesture settings string" into sc-dev 2021-04-08 23:42:34 +00:00
TreeHugger Robot
fa3ac98d3b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-08 21:33:55 +00:00
Fan Zhang
2627771575 Update emergency gesture settings string 
Bug: 171584515
Test: manual
Change-Id: I4df78f2f88676a16b8e8664301b631586ca6c74c
 2021-04-08 19:49:02 +00:00
Abel Tesfaye
5d6438391f Add warning message when camera privacy lock is enabled for screen attention settings 
Test: locally with flame, make RunSettingsRoboTests -j$(nproc)
ROBOTEST_FILTER=AdaptiveSleepCameraStatePreferenceControllerTest,
AdaptiveSleepPreferenceControllerTest

Bug: 177462182
Change-Id: I9880d6b82e9a5040534aceda4ff15275e0bcf72a
 2021-04-08 19:40:58 +00:00
TreeHugger Robot
5fdac28f82 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-08 18:51:37 +00:00
Yu-Han Yang
a13c0f5d7a Add icons to Manage location services and App location permissions 
- Also updates footer strings

Bug: 180533061
Test: on device
Change-Id: Id75d74ebe72e92f314fbb116beaacb301f86b34a
 2021-04-08 09:47:26 -07:00
Bill Yi
8648b96614 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia8ed93a713ff8a0029d710bfd3851c38a789d67b
 2021-04-08 13:31:53 +00:00
Bill Yi
e69a08ffe7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4f9492c1f18fb47712268b07137b028ed82b2ae5
 2021-04-08 12:31:36 +00:00
TreeHugger Robot
f2a4dde889 Merge "Update the strings for Media Management Apps" into sc-dev am: 4346f40f2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14060704

Change-Id: I20f2d9d505aa0032b01629ecebbc440bfdb14a56
 2021-04-08 11:16:58 +00:00
TreeHugger Robot
4346f40f2d Merge "Update the strings for Media Management Apps" into sc-dev 2021-04-08 10:41:15 +00:00
TreeHugger Robot
1de8fa7b91 Merge "Add icon to "Open [safety app] button" into sc-dev am: 9bf1412af7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108402

Change-Id: I660eac4b2ee2bf49ad52a3369d8c0fcbe81a74ce
 2021-04-08 09:27:00 +00:00
Jeremy Goldman
bcf8103e7b Merge "Update string associated with Connected, Always On or Insecure VPNs" into sc-dev am: ea42dd3c49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111133

Change-Id: I1a9cb1d358aad35fa8a2fdb037f487bf814b39d8
 2021-04-08 09:26:55 +00:00
TreeHugger Robot
9bf1412af7 Merge "Add icon to "Open [safety app] button" into sc-dev 2021-04-08 08:53:45 +00:00
Jeremy Goldman
ea42dd3c49 Merge "Update string associated with Connected, Always On or Insecure VPNs" into sc-dev 2021-04-08 08:50:53 +00:00
Arc Wang
3c03a6f088 Merge "Sets Storage Settings progress bar unselectable" into sc-dev am: 5e23987a28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111142

Change-Id: I469e4f159a721b86674224ffcab153339c8aabff
 2021-04-08 02:37:35 +00:00
Arc Wang
5e23987a28 Merge "Sets Storage Settings progress bar unselectable" into sc-dev 2021-04-08 02:08:45 +00:00
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
TreeHugger Robot
76193c0bea Merge "Use "Passwords & accounts" instead of "Passwords and accounts"" into sc-dev 2021-04-08 01:48:55 +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
TreeHugger Robot
ec7c17c3cd Merge "Mark non actionable preferences as non-selectable" into sc-dev 2021-04-07 19:55:34 +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
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
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
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
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
TreeHugger Robot
97e98f0e44 Merge "Fix AddNetworkFragment bottom buttons position problem" into sc-dev 2021-04-07 12:38:14 +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
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
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
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
ykhung
211d9ea824 Move the battery components from SettingsGoogle to Settings am: b350c66d97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108646

Change-Id: Ibf061708de17eb959d265d9bfbf0822e87041135
 2021-04-07 08:32:48 +00:00
Ryan Lin
7bb5b8f326 Merge "Change illustrations of Magnification Settings" into sc-dev 2021-04-07 08:19:32 +00:00