Commit Graph

23808 Commits

Author SHA1 Message Date
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
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
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
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
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
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
6b424d264d Merge "Change One-handed mode controls states in the Settings pages for improving better UX experience" into sc-dev am: 150ed0b071 am: 8ea6f6382e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109467

Change-Id: I8c2c85944500d0a050516f923d41babaf709c479
2021-07-01 10:57:36 +00:00
TreeHugger Robot
8ea6f6382e 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: I51f27def0f935eba855bf711aa961b1b4f8c33ae
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
017ff60a19 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev am: 69e246ab89 am: 1150684841
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126543

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

Change-Id: I4a162c7a407bb45841a2c32398ba3de4c7929b09
2021-07-01 09:51:18 +00:00
TreeHugger Robot
1150684841 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: I97a7889809b2f1f9dadf6fc6e700dd90b8eff202
2021-07-01 09:37:13 +00:00
Betty Chang
8bf1d8bc1b 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: I00499ed64a2bf9aba573ae3b9cb8c05558f50f73
2021-07-01 09:35:15 +00:00
Jason Chang
d9a4197d9d Change One-handed mode controls states in the Settings pages for
improving better UX experience

According to UX feedback to adjust One-handed mode UI
controls’ status in the Settings page for better UX experience.

Bug: 192171369

Test: manual verified on Settings > System > Gesture page
> System controls page
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedMainSwitchPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedActionPullDownPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
      "com.android.settings.gestures
      .OneHandedActionShowNotificationPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedPreferenceCategoryControllerTest"

Change-Id: I76242fe70c3ec06cd5e2f9bb059c87293cc686dd
2021-07-01 17:05:27 +08:00
TreeHugger Robot
69e246ab89 Merge "Update title and subtext of Contact search in Work profile settings" into sc-dev 2021-07-01 09:02:39 +00:00
Betty Chang
60d2057417 Merge "Add Adaptive Connectivity switch on/off string for fixing string gender" into sc-dev 2021-07-01 08:53:10 +00:00
Wesley Wang
6e08e02adb Merge "Update high usage tips string" into sc-dev am: ddc8a5db98 am: 38c4b3d1b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303

Change-Id: I23cb3f721c985549710e3cedcaf20d6ef55b4766
2021-07-01 08:45:15 +00:00
Wesley Wang
38c4b3d1b0 Merge "Update high usage tips string" into sc-dev am: ddc8a5db98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109303

Change-Id: I8f6a1f8cdb11ba2886f3d04f1bace113c78e08d7
2021-07-01 08:32:41 +00:00
Wesley Wang
ddc8a5db98 Merge "Update high usage tips string" into sc-dev 2021-07-01 08:22:11 +00:00
Jason Chiu
a460e4f890 Update title and subtext of Contact search in Work profile settings
Test: visual
Bug: 184610902
Change-Id: I5391ce3c1dc4aef6ec9e840f382d74a6a399e562
2021-07-01 07:22:40 +00:00
changbetty
b453e44bf8 Add Adaptive Connectivity switch on/off string for fixing string gender
Bug: 189234188
Test: Manual test
Change-Id: I8a3df2a0f4b364e4bc31e0efd116312b5fdf3b42
2021-07-01 14:57:52 +08:00
TreeHugger Robot
c1d51336ee Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c am: ca65634d48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: I4efe13f97a27670a0dbec376c8e2072cd26699ea
2021-07-01 03:03:28 +00:00
TreeHugger Robot
ca65634d48 Merge "Fix ManageApplications pinned header overlaps content" into sc-dev am: f421525d2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126430

Change-Id: Ica04ca516c5d315a0844cfa3bfda0c9511f50cb4
2021-07-01 02:50:30 +00:00
TreeHugger Robot
f421525d2c Merge "Fix ManageApplications pinned header overlaps content" into sc-dev 2021-07-01 02:38:18 +00:00
Ahaan Ugale
d4ce558f33 Password settings: Fix work profile
Currently, the work profile password settings just point to the personal
profile app. This change fixes this using the forWork metadata tag, that
sets the work profile user in BasePreferenceController.

Also fixes and re-enables the
displayPreference_withPasswords_addsPreference test.

Fix: 192417100
Test: manual - work profile link works, password count is accurate
Test: atest PasswordsPreferenceControllerTest
Change-Id: I6345b69b9c03ff13b8e2784e69dc0188abc436e3
2021-06-30 17:22:07 -07:00
TreeHugger Robot
be3afca13f Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: cb00a65a0d am: f695195dd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124032

Change-Id: If20eb1c8705353feacfe8af481bb0b245dbc05ea
2021-06-30 09:51:02 +00:00