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
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
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
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
75b9cc3d21
Merge "Move selectability to switch from container" into sc-dev am: 235006fc35
am: cf423fbf96
am: 1423cffb6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372
Change-Id: If6c157cfcb52fd1d5533cd41b82df3c6023f2fed
2021-07-02 08:50:40 +00:00
TreeHugger Robot
84eb0fd613
Merge "Move selectability to switch from container" into sc-dev am: 235006fc35
am: cbc37a271a
am: 5046ed6a6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372
Change-Id: If942e506b8128f5871ab99d4afe100c450ece5ea
2021-07-02 08:50:30 +00:00
Stanley Wang
b757a6e9f2
Fix the problem that when the MainSwitchPreference is gone,
...
there will be a blank area.
- Disable the visibility of preference when the the hide() method
is invoked.
Fix: 192332931
Test: robotest and see the UI
Change-Id: Iec5a06ca689843ebb692b1b7040f1d2be9f45bc2
2021-07-02 16:43:21 +08:00
TreeHugger Robot
e6cff5497d
Merge "Password settings: Fix work profile" into sc-dev
2021-07-02 08:42:26 +00:00
TreeHugger Robot
1423cffb6a
Merge "Move selectability to switch from container" into sc-dev am: 235006fc35
am: cf423fbf96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372
Change-Id: Ifbeb33246358ef9e9e9534a57de223a41b5cb502
2021-07-02 08:36:14 +00:00
TreeHugger Robot
5046ed6a6a
Merge "Move selectability to switch from container" into sc-dev am: 235006fc35
am: cbc37a271a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372
Change-Id: I5a1f61b64afda36d49693efc7066a0f46932727f
2021-07-02 08:35:53 +00:00
TreeHugger Robot
a8cee3e24f
Merge "Move selectability to switch from container" into sc-dev am: 235006fc35
am: 92928981f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15177372
Change-Id: I983b8a6a80426a67adff66b4ee722b94f5e8c11f
2021-07-02 08:35:25 +00:00
Edgar Wang
18e88b86b1
Update the dialog of SIM status and IMEI in About phone page
...
- Update label font size to 20sp and fontFamily
- Update value font size to 14sp and fontFamily
Fixes: 182092163
Test: visual verify
Change-Id: Ieb3cb9e834592e88fe40ba62fe3210754eb928a3
2021-07-02 16:20:36 +08:00
TreeHugger Robot
cbc37a271a
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: Ifc08b76bdc2776709193d8caac1ac95afce1860e
2021-07-02 08:20:06 +00:00
TreeHugger Robot
92928981f9
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: I46fa4127bce97256f86d1996de906c119a725f8b
2021-07-02 08:19:18 +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
Jeremy Goldman
53dc808764
Merge "ManageablePreferenceTest created for VpnSettings"
2021-07-02 07:20:02 +00:00
TreeHugger Robot
db448e04b0
Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd
am: 593ab6faab
am: 8f3fadd898
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652
Change-Id: If912268c364f85549dedb65685ef88b8ac96874f
2021-07-02 07:11:02 +00:00
TreeHugger Robot
5661c73c7f
Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd
am: a74806eec9
am: 74f747b1fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652
Change-Id: I7dc45846bf6f15c932a1b916de0d0bf8abd1b422
2021-07-02 07:10:54 +00:00
George Chang
8fcd3137f1
Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a
am: 3096bae20d
am: 224957b42b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819
Change-Id: Ia497fbb4824e2cb1c387ef0f9d9235ced7602fcc
2021-07-02 07:10:27 +00:00
George Chang
9291299096
Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a
am: 873084ac09
am: ab28ada66b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819
Change-Id: I08c141f90f301f48cce28f2b38aaa845a1a0bc0b
2021-07-02 07:09:31 +00:00
TreeHugger Robot
b8b81052a2
Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd
am: c5fa705394
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652
Change-Id: I66a8bb70587ae35d4ef3a9a3e736caeb873102f5
2021-07-02 07:00:07 +00:00
TreeHugger Robot
8f3fadd898
Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd
am: 593ab6faab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652
Change-Id: I4b21c309830c569bb03a641ce059a753600c0cff
2021-07-02 06:53:05 +00:00
TreeHugger Robot
74f747b1fd
Merge "Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate" into sc-dev am: f1b07d7ddd
am: a74806eec9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083652
Change-Id: Ic6a4b06ecc3621a535b588547399a9c4a48ebeda
2021-07-02 06:52:42 +00:00
George Chang
224957b42b
Merge "Separate NFC on/off strings" into sc-dev am: cd4a4ad90a
am: 3096bae20d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15182819
Change-Id: I89e154504f23787eb457b764c451edbe744d8a86
2021-07-02 06:52:34 +00:00
TreeHugger Robot
a74806eec9
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: I58e0b0ed4c7af6e0dddfe854ecb4e7b22790a9ae
2021-07-02 06:52:25 +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
TreeHugger Robot
c5fa705394
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: Idf6b9fdb741a1e936a3c6c391e70a271edb8b066
2021-07-02 06:51:35 +00: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
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
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
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
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
cd4a4ad90a
Merge "Separate NFC on/off strings" into sc-dev
2021-07-02 06:23:03 +00:00
TreeHugger Robot
4b8e948ffa
Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26
am: 58d95b41c9
am: 867b9eb6d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314
Change-Id: I4b5de8e6a775f70a1fefa3e8fdfc416e42c290ab
2021-07-02 06:13:53 +00:00
TreeHugger Robot
d4c622ccbe
Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5
am: 33a9e928fb
am: a60344a35a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945
Change-Id: I478f8cc07e56d88a676632455927a689127497d4
2021-07-02 06:13:47 +00:00
TreeHugger Robot
65224b1820
Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26
am: 0b95e8c9c7
am: 096f77298b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314
Change-Id: I85c1aba11ed2b6030bfe49be6e9bdbdb191a4418
2021-07-02 06:13:39 +00:00
TreeHugger Robot
7c110028fe
Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5
am: d30e518f0c
am: de02870306
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945
Change-Id: Iea42fc1ea9d32d33b0091a6d135b6e0c149ff8f1
2021-07-02 06:13:25 +00:00
TreeHugger Robot
867b9eb6d1
Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26
am: 58d95b41c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314
Change-Id: I6ae382f07d9b35a36a804a79f4bbb9f664635321
2021-07-02 05:52:33 +00:00
TreeHugger Robot
a60344a35a
Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5
am: 33a9e928fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945
Change-Id: I4b7aee6791c35a07da6636dc95b6c39b016a2d89
2021-07-02 05:52:21 +00:00
TreeHugger Robot
096f77298b
Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26
am: 0b95e8c9c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314
Change-Id: Ieb069a51f1a5d0f30fa215ec8cbd3a450cc01dfa
2021-07-02 05:52:03 +00:00
TreeHugger Robot
de02870306
Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5
am: d30e518f0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945
Change-Id: I091bedaccfde3ee417d2e9da758583495ce10b1d
2021-07-02 05:51:59 +00:00
TreeHugger Robot
429d06a0cf
Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26
am: 37f74d4aab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314
Change-Id: Ie9f7fbf6de904e3002772c6e2cb004f1f9099035
2021-07-02 05:51:48 +00:00
TreeHugger Robot
5864029f82
Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5
am: 3b9e5510d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945
Change-Id: I455deb9fa42d17862ad6b8b943cee62049cbb68d
2021-07-02 05:51:33 +00:00