Commit Graph

98843 Commits

Author SHA1 Message Date
Jason Chiu
8c10cb51db Merge "Support highlighting the menu entry for Search results" into sc-v2-dev am: c144f7bb89 am: a6cd1fee05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16234663

Change-Id: I06ab4a8fa73b9faf301bf3af2068b1461e14fdf0
2021-11-16 07:52:14 +00:00
Jason Chiu
a6cd1fee05 Merge "Support highlighting the menu entry for Search results" into sc-v2-dev am: c144f7bb89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16234663

Change-Id: I95ab4ae7fa4c8217d8dfef8ae1a07976681815ee
2021-11-16 07:40:47 +00:00
bvineeth
5b90dfad34 Typo fix in media settings title variable
Fixed the typo in variable for media settings title, due to which the
title was not being fetched from configuration.

Bug: 199012697
Test: Manual
Change-Id: I256e55a13f2f06ca0b2800ceb01900d5e12d9834
2021-11-16 07:35:18 +00:00
Jason Chiu
c144f7bb89 Merge "Support highlighting the menu entry for Search results" into sc-v2-dev 2021-11-16 07:28:32 +00:00
TreeHugger Robot
fffee452f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours am: 18346ea63d -s ours am: 24d2a7e110 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98e11b704959e2d6944c69f2e770a99ae965e387
2021-11-16 07:28:06 +00:00
TreeHugger Robot
c5a5b4c241 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f am: 5cd61aab24 am: e8ef94d5b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I44574a414a5bc2d81b9988d8b4c875113163ab38
2021-11-16 07:27:58 +00:00
Bill Yi
9fac5896bf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours am: 84ac5a3cc4 -s ours am: 35872d705c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41f638391d04698e47dfaf6c8853b9530c1865fb
2021-11-16 07:27:57 +00:00
TreeHugger Robot
9aa175f82b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours am: 0bbf5438d0 -s ours am: e1dcef06bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62655a6a5ece93ed14bb0ce9ec0c20fa654c6c4b
2021-11-16 07:27:21 +00:00
TreeHugger Robot
2ed7f67e98 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f am: ed43498d71 am: 93c9001958
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: Ic9d0d4e4da26594c1a6b94907e69bff3cd22c0dc
2021-11-16 07:26:40 +00:00
Bill Yi
de5aea81c3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours am: 1ab9266897 -s ours am: 0c6c527eac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I947ae03157d56889993be5b9a62b04e5d949f08d
2021-11-16 07:26:36 +00:00
TreeHugger Robot
24d2a7e110 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours am: 18346ea63d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id262432f3b9e29c8a23a022b1867f3cb535da648
2021-11-16 07:15:15 +00:00
TreeHugger Robot
e8ef94d5b7 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f am: 5cd61aab24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: Id90bcdd0ff0e580322c49e49fca66d8e89fc4e6a
2021-11-16 07:14:58 +00:00
Bill Yi
35872d705c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours am: 84ac5a3cc4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31bb907641b260fa735e4a21f50bb0ae8ca3bcae
2021-11-16 07:14:55 +00:00
TreeHugger Robot
e1dcef06bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours am: 0bbf5438d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia42c8cea48ee57a1c273398ebfe63cfb7947082a
2021-11-16 07:13:36 +00:00
TreeHugger Robot
93c9001958 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f am: ed43498d71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I06561e4fe03390fae22c3027604ef93f1f020502
2021-11-16 07:13:06 +00:00
Bill Yi
0c6c527eac [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours am: 1ab9266897 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19f3c4824d9554bf1388496df85bc326c1884824
2021-11-16 07:13:05 +00:00
TreeHugger Robot
e1bc861826 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: fb4f878332 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib31165184d3ad77d8555aa9d061dc7325ca99549
2021-11-16 07:08:56 +00:00
TreeHugger Robot
0bbf5438d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I356b281608f37db8d3683a20840bd274e4c5f26d
2021-11-16 06:57:13 +00:00
TreeHugger Robot
18346ea63d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours am: 868cb753cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8202a8c93f6c61e9c46918b4a51c857d6de6369
2021-11-16 06:57:09 +00:00
TreeHugger Robot
ed43498d71 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: Id969ace896b3a93fc3b3f60a442b65fa445f2a2c
2021-11-16 06:56:52 +00:00
TreeHugger Robot
5cd61aab24 Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev am: 0bbc6e224f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I0f1fc30af470911b608ede9ddf9da71911d6e922
2021-11-16 06:56:50 +00:00
Bill Yi
1ab9266897 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If64647c33ee377a6bd91099bc6fc81c33ecb9dba
2021-11-16 06:56:50 +00:00
Bill Yi
84ac5a3cc4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e am: 1246b8bc86 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f3b09cf7200c7e1cbeca72ecfeff47575f08c49
2021-11-16 06:56:49 +00:00
TreeHugger Robot
868cb753cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55e9911e89da1f596826b485f21db1b943a60b35
2021-11-16 06:56:46 +00:00
TreeHugger Robot
fb4f878332 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 36ae9f88a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ebcb03785306ba49911357140a9d8570e713634
2021-11-16 06:55:33 +00:00
TreeHugger Robot
8922c1200d Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-mainline-prod am: e74c9ae07b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358

Change-Id: I7225600efd6619a32f50eef2a0ecf42016687faa
2021-11-16 06:49:33 +00:00
TreeHugger Robot
36ae9f88a2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-16 06:45:14 +00:00
TreeHugger Robot
0bbc6e224f Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e
  Import translations. DO NOT MERGE ANYWHERE
2021-11-16 06:45:14 +00:00
TreeHugger Robot
e74c9ae07b Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491" into sc-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e
  Import translations. DO NOT MERGE ANYWHERE
2021-11-16 06:45:14 +00:00
TreeHugger Robot
234710ee9d Merge changes from topic "presubmit-am-e5fc2544993e448c8c4f747f05252491"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e 2p: a15f438522
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e
  Import translations. DO NOT MERGE ANYWHERE
2021-11-16 06:45:14 +00:00
TreeHugger Robot
945ed06c01 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 4b53a4dd18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f4b8424c0a2ce3df0ee167a6aa870ced22fff9e
2021-11-16 06:44:07 +00:00
TreeHugger Robot
ce4719549e Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-11-16 06:39:23 +00:00
TreeHugger Robot
ad20dab0d3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-11-16 06:29:00 +00:00
TreeHugger Robot
4b53a4dd18 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-11-16 06:28:57 +00:00
TreeHugger Robot
556ef29c2a Merge changes from topic "presubmit-am-92f06b72980d49e1be03d56e5f168195"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 04a9c6743e
  Import translations. DO NOT MERGE ANYWHERE
2021-11-16 06:28:57 +00:00
Gary Jian
68b861930a Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status
Bug: 205809218
Test: atest NrAdvancedCallingPreferenceControllerTest
Change-Id: I45ac1e95d669801c2d37f49943d7c16cfb7adae3
2021-11-16 04:40:08 +00:00
SongFerngWang
f0575366c4 Lost the registered cellinfo item after the aggregation
Bug: 204384218
Test: atest NetworkSelectSettingsTest
Change-Id: I163ab8e966de57ddff7939a46fc47b05bea029e3
2021-11-16 11:39:44 +08:00
SongFerngWang
4d00bce2b2 Lost the registered cellinfo item after the aggregation
Bug: 204384218
Test: atest NetworkSelectSettingsTest
Change-Id: I8a1af6eadd5852788a5455dd637e1c63316bb802
Merged-In: I163ab8e966de57ddff7939a46fc47b05bea029e3
2021-11-16 11:38:22 +08:00
TreeHugger Robot
f1a30d7696 Merge "Revert "Revert "Update animation for fingerprint edu page""" into sc-v2-dev am: c0cca5c474 am: b9e7e27808
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183660

Change-Id: If0ab56798b36847ccf932b7f7a5b576db7669609
2021-11-15 20:12:45 +00:00
TreeHugger Robot
b9e7e27808 Merge "Revert "Revert "Update animation for fingerprint edu page""" into sc-v2-dev am: c0cca5c474
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183660

Change-Id: Id40079bcd0dfc07725fd4a3fb5201cae93f6135a
2021-11-15 19:58:30 +00:00
TreeHugger Robot
c0cca5c474 Merge "Revert "Revert "Update animation for fingerprint edu page""" into sc-v2-dev 2021-11-15 19:46:19 +00:00
Bill Yi
9b944605af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours am: 73bedcdd7d -s ours am: c2cdc020d3 -s ours am: a582a5892b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65eb4756c1309ddb2fb6069ccf770529566eff48
2021-11-15 17:37:33 +00:00
TreeHugger Robot
310e37abce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40 -s ours am: b7cb455366 -s ours am: bf4586f728 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I809acbb3619fe3472fc5ad657d628e2ee51782f5
2021-11-15 17:37:05 +00:00
Bill Yi
a98a74c53e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6dddd1f0 -s ours am: 16e6040e59 -s ours am: 7a7da305c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6388f053c7ffd22d00510bb378e82c8210fcf1c6
2021-11-15 17:36:22 +00:00
Bill Yi
6470042498 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours am: 73bedcdd7d -s ours am: ef0a786bd7 -s ours am: 0cf8d470fe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85ffbcdf5ae35be6d8086560ce1e08f4a4fa7968
2021-11-15 17:35:40 +00:00
TreeHugger Robot
b009f12155 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40 -s ours am: 30f96b0763 -s ours am: 6d9a1b8daa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied8923e7e9e88f78396bcdee10dffda3ec0559c2
2021-11-15 17:35:00 +00:00
Bill Yi
a582a5892b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7 -s ours am: 73bedcdd7d -s ours am: c2cdc020d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I14c49baa21f1b7585c11a1f8a026870f2dea0f72
2021-11-15 17:34:51 +00:00
Bill Yi
d64b8febbb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6dddd1f0 -s ours am: a83466e2ad -s ours am: e749989be0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7f924bb3bbf1fb86bbf762b62d724ff7f0c3430
2021-11-15 17:34:17 +00:00
TreeHugger Robot
bf4586f728 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40 -s ours am: b7cb455366 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0b219abb8f55896f002301f9823a2350602837d
2021-11-15 17:33:43 +00:00
TreeHugger Robot
3e3eca1752 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bd557d2ddb -s ours am: f370e49613 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia422217bc090cc6d3ba8f93a4083b9c7a17181cd
2021-11-15 17:33:31 +00:00