Commit Graph

85616 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
cd4a4ad90a Merge "Separate NFC on/off strings" into sc-dev 2021-07-02 06:23:03 +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
0b95e8c9c7 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: I7970a92d9fcdd207e60487d84acd22177cab4563
2021-07-02 05:39:07 +00:00
TreeHugger Robot
d30e518f0c 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: I98d9a9a04064e9d599f33ee585f020bdd6c248a7
2021-07-02 05:39:01 +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
2a407d98f2 Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd am: e3c1b7ecac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993

Change-Id: I43ce77d4e820780be16e40ac18b311e9f54a15a1
2021-07-02 04:32:34 +00:00
Yohei Yukawa
a78e1f51fe Switch back to sync IInputMethodManager
This logically reverts two recent CLs [1][2] to submit a corresponding
logical revert [3] into frameworks/base to address Bug 190486491.

 [1]: I767069892c713023b064525105ef2b55946b7bb8
      8279b8ee5a
 [2]: I6733e8b500f5e02d4e14cde4ab7a46f4f716f5d0
      fa01bf30ba
 [3]: If16ac0de536d9089eb04f6e07b1ee47378124658

Bug: 163453493
Bug: 190486491
Test: make RunSettingsRoboTests ROBOTEST_FILTER="WinscopeTraceTest"
Change-Id: Idea98bd36935a27d886ca337154112e7dd293080
Merged-In: Idea98bd36935a27d886ca337154112e7dd293080
2021-07-01 21:24:02 -07:00
Yanting Yang
b14cde1eb5 Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd am: 9fd3223b5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993

Change-Id: I1f4583aed0f03527ba6fcc527be21d6b6ba0eaae
2021-07-02 04:19:07 +00:00
Yanting Yang
e3c1b7ecac 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: Id60d48a6c76a77e572d1521fd204aa93bd77aa7c
2021-07-02 04:10:41 +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
ef3a4cf0b5 Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f am: 7324a4773e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591

Change-Id: I224a0593908991aac192ee90af427046f5297c39
2021-07-02 02:50:15 +00: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