Commit Graph

70283 Commits

Author SHA1 Message Date
Treehugger Robot
442a99bedf Merge "Fix mvno data field summary not update issue" am: 4615179fc5 am: 36c9ca1f2c am: f876f3d0cc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603

Change-Id: I4d607a2c3141ce3c5863b41c88a3157ac6d622b9
2020-07-21 07:28:32 +00:00
Treehugger Robot
f876f3d0cc Merge "Fix mvno data field summary not update issue" am: 4615179fc5 am: 36c9ca1f2c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603

Change-Id: I21df066581d1f2a43b693026a7a389da81922f05
2020-07-21 07:12:31 +00:00
Treehugger Robot
36c9ca1f2c Merge "Fix mvno data field summary not update issue" am: 4615179fc5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1354603

Change-Id: Idf9f8b66f9b65f4118b8b2abd32eca2a076aea79
2020-07-21 06:58:14 +00:00
Treehugger Robot
4615179fc5 Merge "Fix mvno data field summary not update issue" 2020-07-21 06:44:08 +00:00
Bill Yi
708e1e4f9e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I71c7609f5c78b3042c980428f08dbe0eb6db5b67
2020-07-20 21:45:04 -07:00
Neil Fuller
09cd543262 Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22 am: 173a7e73b3 am: 11ed9a5133
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: Id36b65955f7f41c8e825c9727dad5c65685f3117
2020-07-20 15:34:06 +00:00
Neil Fuller
11ed9a5133 Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22 am: 173a7e73b3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: Ieb4ebc79685777bc660df1c3c3aa19e0216dfec3
2020-07-20 15:21:18 +00:00
Neil Fuller
173a7e73b3 Merge "Track core platform API change" am: 1d45573eb2 am: 83d7191a22
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: I7cb7175a827aae27836324e0865c9a6d5ff6b5ed
2020-07-20 15:07:02 +00:00
Neil Fuller
83d7191a22 Merge "Track core platform API change" am: 1d45573eb2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1367136

Change-Id: Ib891567707808332c1fda6228fbb191b13f7df38
2020-07-20 14:45:41 +00:00
Neil Fuller
1d45573eb2 Merge "Track core platform API change" 2020-07-20 14:39:35 +00:00
TreeHugger Robot
1ec9222c36 Merge "UX updates for notif history" into rvc-qpr-dev am: 1fafa1b738
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178344

Change-Id: I3fa33a4f5334f05239a1ab4685485a8cb84295fa
2020-07-20 14:19:30 +00:00
TreeHugger Robot
1fafa1b738 Merge "UX updates for notif history" into rvc-qpr-dev 2020-07-20 14:08:10 +00:00
Neil Fuller
d1c4ea906f Track core platform API change
This commit tracks changes in libcore to extend the IDs recognized
to be associated with a country.

Bug: 155738410
Test: treehugger
Change-Id: I0d75b6c41cdce4a373f73761ccd2d7db357d6548
2020-07-20 11:26:14 +01:00
Automerger Merge Worker
546d76d368 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours am: d019b9d4ff -s ours" into rvc-qpr-dev-plus-aosp 2020-07-18 23:07:38 +00:00
TreeHugger Robot
64590f8cc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours am: d019b9d4ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5b3de37faa32e7fe1c227f8a9656aaafee41393
2020-07-18 23:07:33 +00:00
TreeHugger Robot
ec79c7e303 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: 733eed05c8 -s ours am: 2f0feea3c2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I96a1de7563d1c05116adf3084c3a19e0e37af80e
2020-07-18 23:07:30 +00:00
TreeHugger Robot
23129fe972 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours am: 9af1becfce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ce7d9f9c484813625fb653239c25418e5030f83
2020-07-18 23:07:20 +00:00
TreeHugger Robot
2f0feea3c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: 733eed05c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I581be581d49a7b490aac0b6cb091edf2eb271ac9
2020-07-18 22:45:56 +00:00
TreeHugger Robot
d019b9d4ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5dc849c9fbe45e90b47adc9cb1632998f9322470
2020-07-18 22:45:52 +00:00
TreeHugger Robot
9af1becfce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours am: c8cff2628f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id714265422fcd526946b6dffc65fd18bf117866d
2020-07-18 22:45:37 +00:00
TreeHugger Robot
733eed05c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
2020-07-18 22:30:28 +00:00
TreeHugger Robot
c8cff2628f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: a118c94070 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34932052aef59e637a60d74efeb1db6cfc807e77
2020-07-18 22:30:16 +00:00
TreeHugger Robot
a118c94070 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-07-18 22:14:24 +00:00
Bill Yi
504c673017 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If5aefe4449fb12bc20991bc9f55da58264b9bb72
2020-07-18 01:41:07 -07:00
Automerger Merge Worker
43fa4ce074 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours" into rvc-d1-dev-plus-aosp am: 432af91964 -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: I8813f1f465302e5e305a19771fa63c3490bebbe8
2020-07-18 01:38:09 +00:00
Automerger Merge Worker
bed83a4519 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours am: a679da84a0 -s ours" into rvc-qpr-dev-plus-aosp 2020-07-18 01:37:32 +00:00
TreeHugger Robot
516f2072c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: 2101d1230a -s ours am: 881b14a74d -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: I34625d3fc4edd3f090a8d4b36b62ef191d743378
2020-07-18 01:36:41 +00:00
TreeHugger Robot
4ce6f7a73e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours am: a679da84a0 -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: Ia01214ca2bd472d7c66baaeff0f8d3288d4bb148
2020-07-18 01:36:39 +00:00
TreeHugger Robot
a679da84a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -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: I87c0e2fcb1af85b6703706e1e31fda80a0bec4bd
2020-07-18 01:19:55 +00:00
Automerger Merge Worker
432af91964 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -s ours" into rvc-d1-dev-plus-aosp 2020-07-18 01:19:55 +00:00
TreeHugger Robot
8817099bae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 8469a447c0 -s ours am: de0205d7f0 -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: I6a1b3dbf3c42eafdab788412813eb27d074abd5c
2020-07-18 01:19:47 +00:00
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