Jernej Virag
e51c86ba28
Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127af5
am: 54a1f7b6bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175453
Change-Id: Iebf4e0a50ce0e03eccf3f1852098603a3445b320
2021-07-02 09:08:46 +00:00
Jernej Virag
875aba5a82
Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev am: 1d2371eecd
am: ada2302bd6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175451
Change-Id: I24fd65026297fd671207a18705e215730eadf2b8
2021-07-02 09:08:35 +00:00
TreeHugger Robot
14cbf021fd
Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d
am: febdfba6e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211
Change-Id: I0692f3de1e61c12fef73d08a0072f99335dc9ad7
2021-07-02 09:08:30 +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
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
George Chang
ab28ada66b
Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a
am: 873084ac09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819
Change-Id: I7a7f98b1abc85905b5ad20ec1dc4ae7cb4058ce7
2021-07-02 06:52:21 +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
f467fd28c2
Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f
am: 18c5908b51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591
Change-Id: I2c641144560251a61aab3664a4256d3bd48523ec
2021-07-02 02:49:51 +00: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
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
TreeHugger Robot
19997e4f18
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: I1abc4d82a36c7b17f21d9a92967da049c87c8d37
2021-07-01 09:36:14 +00:00
Betty Chang
59c5b1898f
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: I88a61967854113f8311297e116bcfe5dcdf57d9e
2021-07-01 09:35:42 +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
dccdce75bb
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: I1fb9bac630efc5d6e617e38b40728b94ff0073b3
2021-07-01 08:33:28 +00:00
Wesley Wang
15d004a5b8
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: I45d64bd2ae2014c89092635ca71528955f0e6883
2021-07-01 08:32:38 +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
2ddfd5616d
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: I35fcc3939777cf9b62800a853c5e9746097fdc9b
2021-07-01 02:50:51 +00:00