Commit Graph

92084 Commits

Author SHA1 Message Date
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
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
37f74d4aab 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: I1e71333d7948d6d6db283c97454ff2a6fd5d0bc2
2021-07-02 05:38:17 +00:00
TreeHugger Robot
3b9e5510d4 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: Iaae7c5a6c6cfab0fe937f18d4d69133f8f5f6849
2021-07-02 05:38:13 +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
5f4aeb6287 Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd am: e3c1b7ecac am: 2a407d98f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993

Change-Id: Ic34b4e780f27a74b77729c898b8a7afbdcba0ba2
2021-07-02 04:36:40 +00:00
Yanting Yang
abb8d4b087 Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd am: 9fd3223b5a am: b14cde1eb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993

Change-Id: I31c834f61b7dd1ae7ef9ab5750ce095d5bef04c4
2021-07-02 04:36:33 +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
b7f21e9723 Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd am: 4e4cae07b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993

Change-Id: I56c9d4c8a80006e2a1186a1a573c3acd669e2b4e
2021-07-02 04:18:17 +00:00
Yohei Yukawa
3e20e0ec37 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
2021-07-01 21:17:59 -07: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
4e4cae07b9 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: If9a5a7dd32c240d85ef69245b67cd0a81b407557
2021-07-02 04:09:16 +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
Stanley Wang
e08f1f71c6 Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f am: 7324a4773e am: ef3a4cf0b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591

Change-Id: I4374e6cf6b8755a34fef013cd020797e14f73b9d
2021-07-02 03:03:23 +00:00
Stanley Wang
916b86e6c8 Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f am: 18c5908b51 am: f467fd28c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591

Change-Id: I09ad4826790463528238d0ff110cc9d27b741bdd
2021-07-02 03:03:11 +00: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