Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,373 Commits 1 Branch 0 Tags
f2efb8f97bdd515c878595698bb3baee703f3f93
Commit Graph

23832 Commits

Author SHA1 Message Date
Alex Johnston
f2efb8f97b Merge "Remove credential management app Settings" into sc-dev am: 713d325310 am: 1dc52643b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15046667

Change-Id: I121b749a7a911bc788ef9eb7263fc31335ce4146
 2021-07-02 11:25:06 +00:00
TreeHugger Robot
ab75884d1a Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev am: 74e1408513 am: 0fc4491c09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15183771

Change-Id: Ifd122937471377b51b4c44db4ba874deb8aa6604
 2021-07-02 11:24:57 +00:00
Alex Johnston
1dc52643b2 Merge "Remove credential management app Settings" into sc-dev am: 713d325310 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15046667

Change-Id: I7af2c7ad672a682c6974332a02cc98e3e3d6e2f2
 2021-07-02 11:15:43 +00:00
TreeHugger Robot
0fc4491c09 Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev am: 74e1408513 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15183771

Change-Id: I8ab31b8c9d3be312c0500d036ef6e406c2f3c301
 2021-07-02 11:15:33 +00:00
Alex Johnston
713d325310 Merge "Remove credential management app Settings" into sc-dev 2021-07-02 11:05:49 +00:00
TreeHugger Robot
74e1408513 Merge "Refine the ripple effect and text style of ActionPrimaryButton" into sc-dev 2021-07-02 11:04:59 +00:00
TreeHugger Robot
ce38106111 Merge "Autofill settings: Fix search" into sc-dev am: 68f3726375 am: 82b4b46b4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171260

Change-Id: Ic8a4129f979186e343ef855a7ece95b8c13e57e0
 2021-07-02 10:35:40 +00:00
TreeHugger Robot
82b4b46b4f Merge "Autofill settings: Fix search" into sc-dev am: 68f3726375 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171260

Change-Id: I7b34a88cd94311db2193ac19453f21af57c60d66
 2021-07-02 10:23:26 +00:00
TreeHugger Robot
68f3726375 Merge "Autofill settings: Fix search" into sc-dev 2021-07-02 10:12:18 +00:00
Stanley Wang
c7b3244b2e Merge "Update the illustration of NFC page." into sc-dev am: 14a31ce9d6 am: 467b5e4ce1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15185254

Change-Id: Ib09c56086146500d22eade1b1da2f5a5a3c477f5
 2021-07-02 09:51:46 +00:00
TreeHugger Robot
39744113dd Merge "Fix "notification" should be "notifications" in One-handed mode settings page" into sc-dev am: 2da798c50a am: 88b98afe17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15186112

Change-Id: I529d9de5e80e166510def6957421d957994533bb
 2021-07-02 09:51:40 +00:00
Stanley Wang
467b5e4ce1 Merge "Update the illustration of NFC page." into sc-dev am: 14a31ce9d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15185254

Change-Id: I25ee23de94ac7832dab80be668de3ee67c9a129d
 2021-07-02 09:47:58 +00:00
Stanley Wang
14a31ce9d6 Merge "Update the illustration of NFC page." into sc-dev 2021-07-02 09:47:50 +00:00
TreeHugger Robot
88b98afe17 Merge "Fix "notification" should be "notifications" in One-handed mode settings page" into sc-dev am: 2da798c50a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15186112

Change-Id: I9014cd3c8e7e1dc7e7853aae0c1fa290eea61b16
 2021-07-02 09:47:39 +00:00
Jason Chiu
7b8eea386c Refine the ripple effect and text style of ActionPrimaryButton 
- The background color of the button is inverted, which has to be
  applied to inverse ripple colors.
- Update the font size and family.

Fixes: 190338973
Test: visual, manual
Change-Id: Ia7447b5e2f64546e0f011cca904d1317d6a38cf1
 2021-07-02 17:45:42 +08:00
TreeHugger Robot
2da798c50a Merge "Fix "notification" should be "notifications" in One-handed mode settings page" into sc-dev 2021-07-02 09:36:58 +00:00
Jernej Virag
9dac23b37b Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127af5 am: 831d02823c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175453

Change-Id: I297a6b96c6b5360223e7c2fef8ce752a2e9a3404
 2021-07-02 09:08:05 +00:00
Jernej Virag
36f9888e3b Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev am: 1d2371eecd am: 4efb8652a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175451

Change-Id: Id9520cb76d7bca2449f013d6f8e344fedb9c444f
 2021-07-02 09:07:58 +00:00
TreeHugger Robot
25854227de Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d am: e77a10c6e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211

Change-Id: Id6ccd62924cc433f9eddb1ba3a2e70a74a6c29c1
 2021-07-02 09:07:51 +00:00
Jernej Virag
831d02823c Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127af5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175453

Change-Id: I9e617e42c9deb5aa1e1e0014e08dec8e089373cf
 2021-07-02 08:54:57 +00:00
Jernej Virag
4efb8652a8 Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev am: 1d2371eecd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175451

Change-Id: I6da7f01d56a4abb156cf9200b3b4c04eb9ad3bfd
 2021-07-02 08:54:51 +00:00
TreeHugger Robot
e77a10c6e5 Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211

Change-Id: I54e9b7807c49e56624b2b8235f99120541af522f
 2021-07-02 08:54:38 +00:00
Jernej Virag
555d127af5 Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev 2021-07-02 08:51:56 +00:00
Jernej Virag
1d2371eecd Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev 2021-07-02 08:51:17 +00:00
TreeHugger Robot
e6cff5497d Merge "Password settings: Fix work profile" into sc-dev 2021-07-02 08:42:26 +00:00
Jason Chang
23345bcbfb Fix "notification" should be "notifications" in One-handed mode 
settings page

Change "notification" to "notifications" for wrong string.

Bug: 192345310

Test: manual verified on System > Gestures > One-handed mode page
Change-Id: I9cf49a2a037483b118027488f36669b9db26a21e
 2021-07-02 16:17:49 +08:00
Stanley Wang
634f3d6655 Update the illustration of NFC page. 
- NFC uses the old component to display the illustration.
  Use the IllustrationPreference to display the illustration.

Fix: 192630194
Test: robotest and see the UI
Change-Id: Idcae247e0af039749dca072dd7fa44839b0b787d
 2021-07-02 15:39:29 +08:00
George Chang
3f3d52481e Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a am: 17612289b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819

Change-Id: I09c4d1815f192b1463fe2d1b6d91354f4e9149a8
 2021-07-02 06:42:26 +00:00
George Chang
17612289b4 Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819

Change-Id: I9f77c47ba941ae489598b5dcc930c00e20c36222
 2021-07-02 06:33:23 +00:00
George Chang
96b5af7e39 Separate NFC on/off strings 
For pt-BR, it needs a different gender when we are referring to "NFC".

Bug: 189314407
Test: check On/Off strings
Change-Id: I87da43c66a65b3ef2fcd9c57632b36302d9920e8
 2021-07-02 11:20:03 +08:00
Stanley Wang
278e468255 Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f am: 392d0b7581 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591

Change-Id: Icad351419dbd83b4d9d476b27e868a08daa27249
 2021-07-02 02:49:23 +00:00
Stanley Wang
392d0b7581 Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591

Change-Id: Id6491bd488ce7d8d1d279160743425b7baf5bbee
 2021-07-02 02:36:36 +00:00
Stanley Wang
38f6a9738f Merge "Update the illustrations of camera gestures." into sc-dev 2021-07-02 02:23:19 +00:00
TreeHugger Robot
74b25978ac Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev am: 588c13555d am: 7bc93a4d5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175824

Change-Id: I21924526a85c7d9dae60f5267d1bfd0affd9cac1
 2021-07-01 19:46:58 +00:00
TreeHugger Robot
7bc93a4d5c Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev am: 588c13555d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175824

Change-Id: Ib0a2b59ef13e991a17b63ba899d9d4dd94fa991c
 2021-07-01 19:28:29 +00:00
TreeHugger Robot
588c13555d Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev 2021-07-01 19:11:51 +00:00
TreeHugger Robot
62f574b502 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08 am: 96cb752b6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365

Change-Id: I7a1fccdb9b5e61623fa4c59c068d9613e16f0095
 2021-07-01 17:49:43 +00:00
TreeHugger Robot
96cb752b6f Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365

Change-Id: I0b542f1b56142d9331dadfacc749769ee6d5c542
 2021-07-01 17:49:33 +00:00
TreeHugger Robot
fe4dac1cb8 Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7 am: de5043c516 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930

Change-Id: If484870dec81abe5b65346840a99e4b53848a2bc
 2021-07-01 17:48:33 +00:00
Curtis Belmonte
4cf13de04d Adjust UI of face and fingerprint enroll intro pages 
Changes the appearance and spacing of the face and fingerprint unlock
intro/consent pages to be consistent with one another and more closely
match the latest mocks.

Test: Manually tested face and fingerprint enrollment

Fixes: 192475206
Change-Id: I4d41ddc15dc1a6be818762a286f06470344cf819
 2021-07-01 10:38:25 -07:00
TreeHugger Robot
af63867d08 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev 2021-07-01 17:35:51 +00:00
Peter Wang
494c68e3cf Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil" 
This reverts commit eba8857094.

Reason for revert: Issue not urgent enough to go in S, will resubmit to master

Bug: 185553806
Change-Id: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9
 2021-07-01 17:35:43 +00:00
Jernej Virag
bb75bb911e Update Prevent Ringing setting to avoid conflict with long press power 
Long press power setting overrides Prevent ringing setting key chord. This updates the Prevent Ringing setting to disable it when LPP setting conflicts and adds a string describing why this setting is disabled.

Bug: 191971326
Test: Manually on device
      Unit tests in PreventRingingParentPreferenceController
Change-Id: If9fc8318381def7e4bbd71a0f5db3f38c474cb3d
 2021-07-01 17:28:45 +00:00
TreeHugger Robot
de5043c516 Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930

Change-Id: Idc31df33e3049dbdc1c76aee1ccfc40a9668ce58
 2021-07-01 17:28:17 +00:00
TreeHugger Robot
964404b2b7 Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev 2021-07-01 17:17:01 +00:00
Yanting Yang
29d6a13c58 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 am: afd19d5310 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I158505cd98c0765162d17771e91d0926c67e2887
 2021-07-01 16:42:34 +00:00
Jernej Virag
bce875ee2a Move Prevent Ringing gesture underneath power menu 
Bug: 191971326
Test: Configuration change
Change-Id: I0696e96f196ce862288d2d2e752aeefa4d3aa1fd
 2021-07-01 16:38:50 +00:00
Yanting Yang
afd19d5310 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I1f889aa1f72b79e23b7b7e7a2e954a055baa35d8
 2021-07-01 16:33:16 +00:00
Yanting Yang
fdc7659754 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev 2021-07-01 16:24:15 +00:00
Alex Johnston
0e898acd4a Add bottom padding to 'Choose a new lock screen' 
* Add 24dp padding

Before: https://screenshot.googleplex.com/64sTaMhwqMKQ4CE
After: https://screenshot.googleplex.com/As33LmkLXG7duV5

Bug: 192541032
Test: manual testing (see screenshots)
Change-Id: I4e29e4f776e7be1c42301c39c4844d7ee948eaaa
 2021-07-01 16:20:23 +01:00