Commit Graph

33828 Commits

Author SHA1 Message Date
vichang
25c5553ef8 Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e am: 7485036f53 am: bc7f639e15 am: 56a24f9ac1 am: f233240117
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663

Change-Id: I47f49f1928a26300ddaed83e0e67f95a0dc09d1f
2020-07-02 11:45:30 +00:00
vichang
56a24f9ac1 Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e am: 7485036f53 am: bc7f639e15
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663

Change-Id: I8d99d5ce1a84db343dac195a38c47041b7bf66f3
2020-07-02 11:03:47 +00:00
vichang
bc7f639e15 Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e am: 7485036f53
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663

Change-Id: I8e81b3d707bce016006bf0af1f75785ecd15648e
2020-07-02 10:50:06 +00:00
vichang
268371c44e Merge "Move libcore.timezone to the i18n module - Final part" 2020-07-02 10:25:54 +00:00
Kevin Chyn
2e7fc5a0d7 Merge "Update settings together with frameworks/base" 2020-07-02 02:57:48 +00:00
Kevin Chyn
4624a1ca5d Update settings together with frameworks/base
Bug: 157790417

Test: SettingsRoboTests
Change-Id: Ib99d1cc2cb3196dd7231d0b78403427467a787b2
2020-07-01 00:08:40 -07:00
Victor Chang
b07e53c1c8 Move libcore.timezone to the i18n module - Final part
Bug: 141747409
Test: atest CtsLibcoreTestCases  CtsLibcoreTestCases
Change-Id: I48a1f383403a553639f525ef92996292fab84c5e
2020-06-30 14:35:09 +01:00
Stanley Wang
fdb6ff079c Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da am: ca05c7fabd am: 4ff2999126
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I35c7c18c370db76bd1d82f319003cb164d9b7246
2020-06-30 11:10:44 +00:00
Stanley Wang
ca05c7fabd Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261

Change-Id: I132e88d5b1cb22db5042c0e66b6bc61ab30efcba
2020-06-30 10:41:41 +00:00
Stanley Wang
e86dd271da Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev 2020-06-30 10:28:33 +00:00
Stanley Wang
db0687c447 Remove the prefix "Model:" from the summary of hardware.
Fixes: 159529327
Test: run robotest and observe the UI
Change-Id: I60f4a341b427e4b619a202a440f3f2554c562a27
2020-06-30 16:45:47 +08:00
Joshua Duong
c811213dde Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328 am: 8917715fca am: c4e8b3822b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I60a80788887e25d1296bffd3aff200763b6c8678
2020-06-30 02:30:37 +00:00
Joshua Duong
8917715fca Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88 am: d6b68cb328
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: I8f07e53a674a9494a7148dcee9e9bf45db097330
2020-06-30 02:07:53 +00:00
Joshua Duong
ba1e9c30c4 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: Id03f133b8480af4f1febe9cbf7b9024896ba67b1
2020-06-30 01:52:18 +00:00
Joshua Duong
d6b68cb328 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev am: 8776749e88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12006805

Change-Id: Ic5de5436b1386028a26f121d8d857d27e7aebece
2020-06-30 01:51:47 +00:00
Joshua Duong
8776749e88 Merge "[qrcode] Open any available camera if back camera isn't available." into rvc-dev 2020-06-30 01:41:14 +00:00
Kevin Chyn
74ed9014a8 Merge "Update Settings together with generateChallenge/revokeChallenge" 2020-06-30 00:41:05 +00:00
Minche Li
08e2fec40d Merge "Supports triple-tap shortcut for window magnification" 2020-06-29 17:05:02 +00:00
Treehugger Robot
49954a28b7 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755 am: d1051792b1 am: c5278b7610
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: I97b1e64a713fddd5325c716ee758c58ade66c593
2020-06-29 15:27:58 +00:00
Treehugger Robot
d1051792b1 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a am: 3947998755
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: Ia665650c897801e914d9c580e4f2f59e9fe2ec28
2020-06-29 15:01:17 +00:00
Treehugger Robot
3947998755 Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc am: fce601ea2a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027

Change-Id: I5fc5d8b00e9b6e0c28389754cd4cf7eeb9bdc969
2020-06-29 14:39:26 +00:00
Treehugger Robot
b1cea4f1bc Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" 2020-06-29 14:14:47 +00:00
LuK1337
ad243904db Settings: Fix fallback summary for power_button_instantly_locks preference
* Using summary_placeholder instead of summary_empty
  leaves an ugly empty space.

Change-Id: I73a90f1b3203d6cb17e1875dc8163eb67140de89
2020-06-29 12:27:06 +02:00
TreeHugger Robot
b5e41012c1 Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358 am: 5412d4ab3e am: e7cb1080aa am: 3c23bbceeb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

Change-Id: I0a6d6dfa09e77cb1ea8969f257a2efdb056d2194
2020-06-29 05:23:46 +00:00
TreeHugger Robot
e7cb1080aa Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358 am: 5412d4ab3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

Change-Id: I14a35d865b8ea449ebf4d410f4bf205e5a40767d
2020-06-29 04:52:29 +00:00
TreeHugger Robot
c667ed0244 Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

Change-Id: I576d18617e5b5860017d102df90d569f0e056c06
2020-06-29 04:40:54 +00:00
TreeHugger Robot
5412d4ab3e Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev am: 531dbf5358
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970200

Change-Id: Id1444c234fb4a0b238fafc02a5f24f880e32d8c4
2020-06-29 04:40:39 +00:00
TreeHugger Robot
531dbf5358 Merge "[Wi-Fi] Fix MAC address title information display bug" into rvc-dev 2020-06-29 04:28:20 +00:00
Bonian Chen
9e0527bfc9 Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev am: 136cb73ae6 am: 8793b373be am: 14a6d13916 am: 1dc1032304
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970202

Change-Id: I1aa01edb029a24dce6a8b0df6d41ea720c11831f
2020-06-29 02:32:29 +00:00
Bonian Chen
14a6d13916 Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev am: 136cb73ae6 am: 8793b373be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970202

Change-Id: Ic8100d80a87dbc9160e6f0cd0d2d0da4648c1b86
2020-06-29 02:05:26 +00:00
Bonian Chen
6e8f6d840a Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev am: 136cb73ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970202

Change-Id: I7af555ea420dc289052553706931fbfea55edf45
2020-06-29 01:53:51 +00:00
Bonian Chen
8793b373be Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev am: 136cb73ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970202

Change-Id: I226e7c7d6ad569d74acec3e306e7745c67056752
2020-06-29 01:53:30 +00:00
Bonian Chen
136cb73ae6 Merge "[Settings] Learn more link should be removed when not supported." into rvc-dev 2020-06-29 01:42:26 +00:00
Daniel Sandler
0394734aaf Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341 am: 75e505cc88 am: bfd11a8930 am: 54e05c08ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: Ie2049770c6a8b3c87be8a4e1131e7452dce74ea7
2020-06-26 22:22:01 +00:00
Daniel Sandler
bfd11a8930 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341 am: 75e505cc88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: Ic8c299f34fc9d7ba7c8e77065d027c3f896f8f4a
2020-06-26 21:52:38 +00:00
Daniel Sandler
efa762ee38 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: I9badb63c20a466ead612cc0e0a679015007a1a00
2020-06-26 21:39:05 +00:00
Daniel Sandler
75e505cc88 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: I159e8a7c412967b5ac9c063ecd01d4554ec90d4f
2020-06-26 21:38:56 +00:00
Daniel Sandler
5d625e2341 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev 2020-06-26 21:22:26 +00:00
TreeHugger Robot
0e39b74456 Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev am: 15a62defd0 am: 753eb655d1 am: f6c9709fb4 am: 7ed4fc03fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12003874

Change-Id: I360861641cfd2a9b71a3f42419129a08b3a64641
2020-06-26 17:35:21 +00:00
TreeHugger Robot
f6c9709fb4 Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev am: 15a62defd0 am: 753eb655d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12003874

Change-Id: I86274d87c917d181639d90d9bb20f3994218fd0e
2020-06-26 17:08:15 +00:00
TreeHugger Robot
263de56a8d Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev am: 15a62defd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12003874

Change-Id: I9d9c01e7ff707dd2024f8d880fdeed7dcea17faa
2020-06-26 16:54:26 +00:00
TreeHugger Robot
753eb655d1 Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev am: 15a62defd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12003874

Change-Id: Ibc086b620e35319115d8101f064143d7069c4598
2020-06-26 16:54:22 +00:00
TreeHugger Robot
15a62defd0 Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev 2020-06-26 16:41:52 +00:00
Joshua Duong
d683d25f47 [qrcode] Open any available camera if back camera isn't available.
Bug: 159956551

Test: make RunSettingsRoboTests ROBOTEST_FILTER=QrCameraTest
Change-Id: I2aa01330c8d12c478f8392f66359131638590b77
2020-06-25 22:16:33 -07:00
TreeHugger Robot
14b8a94a4b Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118 am: 90d1b94c90 am: 983db0546e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206

Change-Id: I54c71ed9814d809ddf366460f935bc9d6cad0f81
2020-06-26 04:43:43 +00:00
TreeHugger Robot
90d1b94c90 Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94 am: 7d20757118
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206

Change-Id: If0538a0f9b7fb4f1f561764de0293b3cb840f910
2020-06-26 04:04:29 +00:00
TreeHugger Robot
c7683448f1 Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206

Change-Id: I8da054d703c2e392c365a84763eb50c8179c3f82
2020-06-26 03:44:38 +00:00
TreeHugger Robot
7d20757118 Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev am: 7a97493f94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970206

Change-Id: I733e3271f14ccadea76736043af88c8be4e62298
2020-06-26 03:44:32 +00:00
TreeHugger Robot
7a97493f94 Merge "Add bottom padding in SliceView for output switcher panel" into rvc-dev 2020-06-26 03:25:46 +00:00
Kevin Chyn
cbe32ed1cf Update Settings together with generateChallenge/revokeChallenge
The internal implementation of generate/revoke in system_server is now
asynchronous. To keep existing clients working, the manager classes
introduce a blocking version of the generateChallenge calls. This change
updates Settings to use the backward-compatible blocking calls.

Bug: 157790417

Test: Enroll fingerprint/face
Test: After enrollment, toggle setFeature or do subsequent enrollment
      in face/fingerprint settings
Change-Id: Ib4dfdc5f12530b938ab9b1745f5a19cd9e2eceee
2020-06-25 17:12:46 -07:00