Commit Graph

69916 Commits

Author SHA1 Message Date
TreeHugger Robot
881b14a74d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: 2101d1230a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: Ia405f34b2e478d1c6e8f45b6c8d9642e094691ca
2020-07-18 01:19:46 +00:00
Automerger Merge Worker
a70aea4d5d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours am: 5497c20d3b -s ours" into rvc-qpr-dev-plus-aosp 2020-07-18 01:01:37 +00:00
TreeHugger Robot
2101d1230a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: Ic225851e46b0907dcb136e74b46b09c01e3b0b8c
2020-07-18 01:01:32 +00:00
TreeHugger Robot
3dd3cd59dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours am: 5497c20d3b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180867

Change-Id: If504f1e77276892a756453f7be4bd83a31ef1c9c
2020-07-18 01:01:32 +00:00
TreeHugger Robot
de0205d7f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178345

Change-Id: Ie466ac7c553b4b8a520b4be13c2b8df2400b0f82
2020-07-18 01:01:29 +00:00
TreeHugger Robot
3671a2caf3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours am: 32b64b4a8b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180867

Change-Id: I1d3d038b0b2a6c7dbc0646e9718a29caa8dfeef4
2020-07-18 01:01:27 +00:00
TreeHugger Robot
32b64b4a8b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180867

Change-Id: I8682ed0e9f836c5038299f34b936499e3e18404e
2020-07-18 00:49:23 +00:00
TreeHugger Robot
5497c20d3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: ef58f37dca -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180867

Change-Id: I9cd904019282afea5c309a2518c1fcbd49f5c638
2020-07-18 00:49:16 +00:00
TreeHugger Robot
8469a447c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-18 00:49:01 +00:00
TreeHugger Robot
ef58f37dca Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-07-18 00:29:52 +00:00
Treehugger Robot
e9a9fb9b87 [automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be am: df7e42a213 -s ours am: b66acd05db -s ours am: a2bc9a8afe -s ours
am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930

Change-Id: I6566aee6b5487fa824c09872a8ca04bc9b1a05c9
2020-07-17 19:42:30 +00:00
Treehugger Robot
a2bc9a8afe [automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be am: df7e42a213 -s ours am: b66acd05db -s ours
am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930

Change-Id: I6192eb9b471ae807ad24f4ec99755a098090188d
2020-07-17 19:13:31 +00:00
Treehugger Robot
b66acd05db [automerger skipped] Merge "Remove NR NSA from voice network type" am: 46a50b35be am: df7e42a213 -s ours
am skip reason: Change-Id I77d92fab0020da356ae43293016237be7494c1e2 with SHA-1 4b5e95daa1 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930

Change-Id: I0b5fe9de55e71422abb8f82fb6ca85c5d627b123
2020-07-17 18:48:00 +00:00
Treehugger Robot
df7e42a213 Merge "Remove NR NSA from voice network type" am: 46a50b35be
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347930

Change-Id: Ic9f0a1b78d4bd5321dbc8ab814246d62d419a563
2020-07-17 18:16:14 +00:00
Treehugger Robot
46a50b35be Merge "Remove NR NSA from voice network type" 2020-07-17 17:57:43 +00:00
Bill Yi
c2c8b6b7a7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9d84173a559cb2a949aba1bc28ef7d98d3f32baf
2020-07-17 10:47:34 -07:00
Bill Yi
706bd58d00 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic3517eef64e0f59a1f7f46d3138e3898a62eb7b9
2020-07-17 08:35:46 -07:00
Julia Reynolds
52cf852b63 UX updates for notif history
- no relative time
- fix background color in dark theme
- fix text alignment in RTL

Test: manual
Fixes: 160061165
Fixes: 160388261
Fixes: 156410384
Change-Id: I7d4c5a5f81ce5b5ce43fdaa3ee99184906753a76
(cherry picked from commit 3dd023f363)
2020-07-17 13:25:05 +00:00
Treehugger Robot
5e2a845c6e [automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6 am: 73a28754f1 -s ours am: 3330abffe8 am: f85f6c82db
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547

Change-Id: I116b7eab12ebd64d3bf9c5840faf875b996ed569
2020-07-17 09:35:23 +00:00
Eran Messeri
c003e578c0 [automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7 am: 091c73f768 -s ours am: f853d0fd25 am: 7e539d9aa0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547

Change-Id: I0d3b00f2cebf8122279aca1281afaf48107edfa1
2020-07-17 09:35:20 +00:00
Treehugger Robot
f85f6c82db [automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6 am: 73a28754f1 -s ours am: 3330abffe8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547

Change-Id: I145f9155dcffa50cf8decb7a73b81417385a1c01
2020-07-17 09:19:16 +00:00
Eran Messeri
7e539d9aa0 [automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7 am: 091c73f768 -s ours am: f853d0fd25
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547

Change-Id: Ib08fb1393f61909b0bec7a72258e90f575e95164
2020-07-17 09:19:13 +00:00
Treehugger Robot
3330abffe8 [automerger skipped] Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6 am: 73a28754f1 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547

Change-Id: I1dd28625768cf364bbaee112a8b2ad4a767cb556
2020-07-17 09:01:21 +00:00
Eran Messeri
f853d0fd25 [automerger skipped] [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7 am: 091c73f768 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547

Change-Id: Ida2e692c72cd1c79d95ae6b0e99196d05fa843e0
2020-07-17 09:01:18 +00:00
Treehugger Robot
73a28754f1 Merge "[DO NOT MERGE] Rollup Cert-related changes from R" am: 01ec6774e6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547

Change-Id: I5c4f7993abf41fbbefca12962061451345c2e62e
2020-07-17 08:43:40 +00:00
Eran Messeri
091c73f768 [DO NOT MERGE] Rollup Cert-related changes from R am: f37c8cb4f7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1363547

Change-Id: Ie170b54b9b15d3abff3ec883d943d597b3719a77
2020-07-17 08:43:38 +00:00
Treehugger Robot
01ec6774e6 Merge "[DO NOT MERGE] Rollup Cert-related changes from R" 2020-07-17 08:28:38 +00:00
Kevin Chyn
61259e7436 Merge "Add face enroll accessibility dialog" into rvc-qpr-dev am: 4b83725ee6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12172087

Change-Id: I2689d66199b0cc6b1deb6dcea8aa1249af793e5b
2020-07-17 02:57:57 +00:00
Kevin Chyn
4b83725ee6 Merge "Add face enroll accessibility dialog" into rvc-qpr-dev 2020-07-17 02:34:39 +00:00
Kevin Chyn
243aa8e2e0 Add face enroll accessibility dialog
When accessibility services such as talkback are enabled, and the
user tries to start the non-accessibility enrollment flow, present
a confirmation dialog.

Fixes: 152633740
Test: Enable talkback, start enrollment
      1) Accessibility flow --> no dialog, as expected
      2) Non-accessibility flow --> new dialog shown
Test: No talkback, start enrollment. No dialog shown in either case
Change-Id: I0cd07a9d0012f6c9bea36e74365a6707755d3ab7
2020-07-16 16:33:16 -07:00
Julia Reynolds
c27cd002c6 Fix overlapping importance icons am: 2f8bc4954c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12171961

Change-Id: I94432f5eccbd7f9acdf6a187c4852594034431a3
2020-07-16 18:07:59 +00:00
Julia Reynolds
2f8bc4954c Fix overlapping importance icons
We can't re-use the same background because not
all of the buttons are the same size

Test: manual
Fixes: 161297551
Change-Id: I8583cb2fbbcb971ab5819eefd84dde3f7c3b4bdf
2020-07-16 14:31:19 +00:00
András Klöczl
219f3d83ee Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6 am: 46922c26f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I3054c49cb04ace38b4072d3fc43cb3e635d02246
2020-07-15 14:42:31 +00:00
András Klöczl
d037ba59a7 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 62f8eba220 am: 5f1984a185
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: Icb990b7b55ecf61eda908eab2467f2b080b3e228
2020-07-15 14:34:18 +00:00
András Klöczl
0e8881b6a0 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6 am: 3bc6e61a44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I3a474956dd0591bc760ab9aba86fd7476f776eb8
2020-07-15 14:34:10 +00:00
András Klöczl
5f1984a185 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 62f8eba220
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I5c3c52b369634f0fd531eabc23397033c1ec2919
2020-07-15 14:19:56 +00:00
András Klöczl
46922c26f6 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I20cc9c95340b76f81ab6c207ad0dcc2fcbf1d3eb
2020-07-15 14:19:44 +00:00
András Klöczl
3bc6e61a44 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0 am: 850263d0c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: Ibc484a119111a84ac0fc6d9ab2b0ab42062fe71d
2020-07-15 14:19:30 +00:00
Eran Messeri
f37c8cb4f7 [DO NOT MERGE] Rollup Cert-related changes from R
This change includes the following commits from internal R branch
which are related to certificate management:

0206e76f46 CredentialStorage: Install keys using KeyChain
09ceea53d9 Added functionality to select type of certificate to be installed from the Settings app
3acf3f5433 WiFi certificates installable from Wifi sub-preference
8439fd15f7 Fix strings for certificate installation in Settings

Bug: 161347472
Test: builds & manual testing
Change-Id: Ia59dc4780254fab4f34c2f61b25f3b4e56ed7b77
2020-07-15 15:12:06 +01:00
András Klöczl
62f8eba220 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I74c9bb596375c68bf414f208d8ad4b6058cf4d37
2020-07-15 14:04:09 +00:00
András Klöczl
850263d0c6 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351ba0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I149473b03717cdbb10aede744e00e34f813b44ac
2020-07-15 14:03:57 +00:00
András Klöczl
15d9351ba0 Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev 2020-07-15 13:50:34 +00:00
Bill Yi
151541c799 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours am: 697f0fc11d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: Iaedccbda4b1463dcf0a59747eb806e6b2b78f261
2020-07-14 16:19:34 +00:00
Bill Yi
7871d50a53 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: 0e7fdac130 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: I3b00968bc0b9079dbd022cc18bd877f6d7646cb8
2020-07-14 16:19:27 +00:00
Bill Yi
697f0fc11d [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: d3265e35db -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: Ib535f86258804daf779ed6267509978332564780
2020-07-14 16:19:23 +00:00
Bill Yi
cad5554144 [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours am: f9cf7d32ec -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: Ic0caea5e5332f9bb11208e4eee81d367037dcb79
2020-07-14 16:19:13 +00:00
Automerger Merge Worker
adb5b7c931 Merge "[automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours" into rvc-qpr-dev-plus-aosp 2020-07-14 16:19:10 +00:00
Bill Yi
9808f1f5f7 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 2580a067e1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941

Change-Id: I9138a2e6f5de4811b14fcfe4f94ae7c65423d68b
2020-07-14 16:19:05 +00:00
Bill Yi
78f997a771 [automerger skipped] Import translations. DO NOT MERGE am: a58e5de4c9 -s ours am: 182290e9b8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12148941

Change-Id: Iee9dd527d25ce6f7e7887ffdae99dd2cd568c6bb
2020-07-14 16:19:01 +00:00
Bill Yi
f9cf7d32ec [automerger skipped] Import translations. DO NOT MERGE am: 2532f0b32c -s ours am: 35632cb1c2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12147777

Change-Id: I2e7ca6f0d84fd0f4606f76f2aace8e7968710c0b
2020-07-14 16:05:13 +00:00