Arc Wang
0110423665
Merge "Fix incorrect storage size in Storage Settings" into sc-dev am: 68caefba32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175229
Change-Id: I522dcf99202b6ab757c930477c92d3068187d4df
2021-07-02 10:23:08 +00:00
Arc Wang
68caefba32
Merge "Fix incorrect storage size in Storage Settings" into sc-dev
2021-07-02 10:05:16 +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
Tom Hsu
ebb36d4126
Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev am: c09f986580
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15173454
Change-Id: I8567ac8442256cd4beb0891fcfacb052a26e03b2
2021-07-02 09:21:32 +00:00
Tom Hsu
c09f986580
Merge "[Settings] Prevent NPE from getting MobileIconGroup instance." into sc-dev
2021-07-02 09:10: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
TreeHugger Robot
cf423fbf96
Merge "Move selectability to switch from container" into sc-dev am: 235006fc35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372
Change-Id: I2358bbcd3186012e583c8357ecbd5893deeea9a6
2021-07-02 08:19:14 +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
TreeHugger Robot
235006fc35
Merge "Move selectability to switch from container" into sc-dev
2021-07-02 08:03:25 +00: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
TreeHugger Robot
593ab6faab
Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652
Change-Id: If5ffafd6426bd6d942b8a44fa1dd2c7317c31af0
2021-07-02 06:42:28 +00:00
TreeHugger Robot
f1b07d7ddd
Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev
2021-07-02 06:40:15 +00: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
cd4a4ad90a
Merge "Separate NFC on/off strings" into sc-dev
2021-07-02 06:23:03 +00:00
TreeHugger Robot
58d95b41c9
Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314
Change-Id: If663e6bfecc6c0576c8b619f16223d0fd23229f4
2021-07-02 05:38:18 +00:00
TreeHugger Robot
33a9e928fb
Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945
Change-Id: Ie661943ee6352757a03f928c9db6e729927a8b7e
2021-07-02 05:38:12 +00:00
TreeHugger Robot
77f0dbaa26
Merge "Correct the choose screen lock page" into sc-dev
2021-07-02 05:26:38 +00:00
TreeHugger Robot
65c9b03fb5
Merge "Fix multiple biometrics enrollment flow" into sc-dev
2021-07-02 05:26:18 +00:00
Yanting Yang
9fd3223b5a
Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993
Change-Id: I8063aed6ceeaf85500d331ce793f38135abf4a9c
2021-07-02 04:09:17 +00:00
Yanting Yang
62315005fd
Merge "Remove stale search result about "Recent location requests" page" into sc-dev
2021-07-02 03:59:29 +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
Arc Wang
25880d0d0e
Fix incorrect storage size in Storage Settings
...
From Android S, Storage Settings queries file sizes
from MediaProvider, it's not necessary to count size
data from getExternalStorageStats when calculating
size data.
Bug: 185542752
Test: make RunSettingsRoboTests ROBOTEST_FILTER=testMeasurementCompletedUpdatesPreferences
manual
1. Connect device to PC via USB File transfer.
2. Copy large files from PC to device.
3. Observe size information in Storage Settings.
Change-Id: I43cbec764e97f5003a4ec981717c9f213a21b614
2021-07-02 10:57:57 +08: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
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
Abel Tesfaye
f60885a040
Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate
...
Bug: 191924078
Test: locally on crosshatch
Change-Id: I8464860c3d1d59c5d4549e7c488457e92054dbba
2021-07-01 19:17:37 +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
Julia Reynolds
94ffc288bd
Move selectability to switch from container
...
To better work with SwitchAcccess
Test: manual with Switch Access (with labels on) and Talkback
Fixes: 189074205
Change-Id: Iafbc4eca9bce8c979ec16a743509b46727cd9eb6
2021-07-01 14:08:39 -04: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
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
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
tom hsu
282b67b1c0
[Settings] Prevent NPE from getting MobileIconGroup instance.
...
Bug: 187812523
Test: Maunal test.
Change-Id: Ief06c683c1c8a99d4ce2765cd802be221e55820e
2021-07-01 22:32:26 +08:00
Yanting Yang
007d1b2a57
Remove stale search result about "Recent location requests" page
...
Based on the new design, RecentLocationRequestSeeAllFragment was no
longer used on Location, but it still implemented the indexable
interface to provide stale search result “Recent location requests”
to Settings Search.
Remove the indexable interface from RecentLocationRequestSeeAllFragment
as a quick fix and also correct the related test method name.
Fixes: 192542283
Test: visual
Change-Id: I1a3df5d7319b8831db2f3d3abba19a11b5a83c81
2021-07-01 20:31:05 +08:00
Tom Hsu
6e24f125ca
[automerger skipped] Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37
am: 6ff7306d51
-s ours
...
am skip reason: Merged-In I179c708debcbc31ba9a93e4e434ae810051f5004 with SHA-1 a2402aba83
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1753980
Change-Id: I76853bce59f351cec5daa360da0a20fc9bd97e78
2021-07-01 12:27:18 +00:00