Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,388 Commits 1 Branch 0 Tags
1d270210ccb248564a72d5b22498ef32fdb85b17
Commit Graph

23797 Commits

Author SHA1 Message Date
TreeHugger Robot
1d270210cc Merge "Autofill settings: Fix search" into sc-dev am: 68f3726375 am: 6f0e92afde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171260

Change-Id: I907abd7735ffa3cabb5453820a41074c84054e02
 2021-07-02 10:36:10 +00:00
TreeHugger Robot
6f0e92afde 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: Ieafa01327758d78166693dc77e02448426c0e1fb
 2021-07-02 10:24:07 +00:00
TreeHugger Robot
68f3726375 Merge "Autofill settings: Fix search" into sc-dev 2021-07-02 10:12:18 +00:00
Stanley Wang
fa05e4e8c7 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: I5e9bbf4006778d69af115600f6471367cd5ff722
 2021-07-02 09:49:07 +00:00
TreeHugger Robot
b0de708916 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: I9d98cea24d562982bb87586c8dcd436cd39456af
 2021-07-02 09:48:29 +00:00
Stanley Wang
449bcaa53b 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: I1384cc6fef14eab2f9876ad1d92e4d9ea1540864
 2021-07-02 09:47:55 +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
65e4bb2c28 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: I7af33fa693709bd3645f25027fee307446c85a8e
 2021-07-02 09:47:37 +00: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
54a1f7b6bb 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: Id323fd7afeef2718283ca765265ad0e895967ca1
 2021-07-02 08:56:11 +00:00
Jernej Virag
ada2302bd6 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: I2f628c75668f6596104450446ccb1e29fa0c1e84
 2021-07-02 08:56:01 +00:00
TreeHugger Robot
febdfba6e4 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: I55d8906c1f910cf658d55fcb2a273e80bf8c691d
 2021-07-02 08:55:51 +00:00
Jernej Virag
86a7aaf139 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: I0626d3a888c1880f64affa523adf837ecede970a
 2021-07-02 08:55:01 +00:00
Jernej Virag
73ac657abe 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: I37862d807713adbbd721e832a7ba17cfa97c49ca
 2021-07-02 08:54:50 +00:00
TreeHugger Robot
22cbf6cdde 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: I69b126f7af645331a2b4815bcb3aa9133ede1cfd
 2021-07-02 08:54:31 +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
3096bae20d 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: Ic46613a626882f06ac273c1cfb9dc1020889db33
 2021-07-02 06:38:16 +00:00
George Chang
873084ac09 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: Ibff4d86ddb896db29ac248205c0a410634365ec1
 2021-07-02 06:34:09 +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
18c5908b51 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: I22b64c767fc9b53c4214fb571a87a9490982520d
 2021-07-02 02:37:22 +00:00
Stanley Wang
7324a4773e 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: I97f1d78f55b8841636a186c9b0bde1c84569218c
 2021-07-02 02:36:35 +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
554a9d39d3 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: I22328129aaf6c992aaf62c662670abe444cb3cc5
 2021-07-01 19:30:27 +00:00
TreeHugger Robot
54d7271920 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: I0e3a1a5e1a52ca9c4ce20a3cf169263a1c742d5b
 2021-07-01 19:29:08 +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
1fe799cb13 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: I1fa95318e792dbbe4055acf5e096254b2c30610f
 2021-07-01 17:49:37 +00:00
TreeHugger Robot
18f3c51a44 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: Ife7873e34cb5410a36acb0a95abcd4e183ee12e0
 2021-07-01 17:49:36 +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
TreeHugger Robot
45a56735d1 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: I8c1f907ff8dca2660a6d32371f57dfe31167031e
 2021-07-01 17:29:13 +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
6b6e438619 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: Ib4810dddb206ac0c4b901924462ee61b11cb832b
 2021-07-01 17:28:26 +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
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
c5f29a8c79 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: I11d4e1a3bb0815a3e3ed43049a01561e7b5b9e89
 2021-07-01 16:34:09 +00:00
Yanting Yang
8236794aa5 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: I7e8efcf1f75541e303ca8ed57de4fb5eef3fba73
 2021-07-01 16:33:12 +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
Stanley Wang
d7825d3627 Update the illustrations of camera gestures. 
- Add the new illustrations of quickly open camera.
- Add the new illustrations of flip camera for selfie.
- Remove the old illustration of quickly open camera.
- Remove the old illustration of flip camera for selfie.

Bug: 190807662
Test: robotest and see the UI
Change-Id: I72030731c6d2fe23ff4b21d366151ac4770c656f
 2021-07-01 19:59:49 +08:00
Yanting Yang
ed7139fad0 Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning 
Since the screen title of the Location Services page is not the same
as the preference title on the Location page, it breaked the page
relation between Location and Location services to lead to the broken
breadcrumbs for Wi-Fi scanning and Bluetooth scanning.

Fixes: 192540579
Test: visual
Change-Id: I9fbc4033517a715e97e534991549a1029ca4e5fa
 2021-07-01 19:22:02 +08:00
TreeHugger Robot
e2b32bceab Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: Idd4de9fb3c9a7d9e97ed54e1fe35d3ce88779a2a
 2021-07-01 10:39:25 +00:00
TreeHugger Robot
e8a6ddc02b Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: If658ebeb08b49494eea84a54d71cc72cf093dbdd
 2021-07-01 10:38:41 +00:00
TreeHugger Robot
150ed0b071 Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev 2021-07-01 10:09:08 +00:00
TreeHugger Robot
b58a2527b7 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

Change-Id: I885a4ffa3d7cc3d416e45bfe20aaf5993857c2af
 2021-07-01 09:37:57 +00:00
Betty Chang
4414631723 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev am: 60d2057417 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165946

Change-Id: I0b2e424022ff77a13af0907b9dbc2723dcf055f9
 2021-07-01 09:37:51 +00:00