Commit Graph

103968 Commits

Author SHA1 Message Date
Bill Yi
537b47d74e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie56499fb898021c83535e0db7f0552c9400e7956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:46:43 +00:00
Bill Yi
e6b9e1fdf5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3cdc674297a6f760c146bfd95190496a88309055
2022-06-07 07:29:07 -07:00
Bill Yi
b398e5434c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8ff8e957617656c81494a816c9e18a4efbd4ed14
2022-06-07 07:17:14 -07:00
Edgar Wang
47b4c86524 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I0f6f87246effdc808b77726a0519d4b063ef4fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:41:48 +00:00
Edgar Wang
1f6334825f Merge "Recalculate view's height when tab is selected" into tm-dev 2022-06-07 04:17:39 +00:00
TreeHugger Robot
671c65235c Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev
* changes:
  Grey out LE audio offload switcher as LE audio isn't enabled/supported
  Unify the LE audio string and refine the layout to put LE audio switch together
  Add LE Audio feature switcher in the developer option menu
2022-06-07 03:37:21 +00:00
Alice Kuo
b51ae97810 Grey out LE audio offload switcher as LE audio isn't enabled/supported
Screenshot: https://screenshot.googleplex.com/C6pRBzLh7CtNeXr

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Change-Id: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
Merged-In: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
(cherry picked from commit f71b2ea56e)
2022-06-07 09:43:08 +08:00
Alice Kuo
ed1a79a97e Unify the LE audio string and refine the layout to put LE audio switch together
Screenshot: https://screenshot.googleplex.com/A6PwLhscRUypgYK

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I2d650eb315790c3efc7510d9e125aeaf4464cda6
Merged-In: I2d650eb315790c3efc7510d9e125aeaf4464cda6
(cherry picked from commit b13abc03dd)
2022-06-07 09:39:25 +08:00
Alice Kuo
948b7cb959 Add LE Audio feature switcher in the developer option menu
Add a switcher to enable/disable LE audio feature. The switcher could be
enabled by setprop ro.bluetooth.leaudio_offload.supported=true

screenshot: https://screenshot.googleplex.com/6aGP664S9PX5EMS

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I8adcf27edd1438df445d32fca93f35ff5020a3b3
Merged-In: I8adcf27edd1438df445d32fca93f35ff5020a3b3
(cherry picked from commit 0d11fd07e7)
2022-06-07 09:36:15 +08:00
TreeHugger Robot
7f6ae2418e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifef4a88d1a87bee4c7344bedc11dacf39c759d5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:21:15 +00:00
Bill Yi
082d0f39ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours
am skip reason: subject contains skip directive

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

Change-Id: If89daeeef0f850ebea96138e384d8b099692c34c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:21:11 +00:00
TreeHugger Robot
868a03b273 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I928b177a20dfd288ccacf2512764b3f067f15108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:21:03 +00:00
Bill Yi
59bb14f56e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I449a641ddef3e8f3ef0c961be79f23a7da760a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:20:56 +00:00
TreeHugger Robot
3de5617a68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a89dc3c0ffad10dec24003198409aad5b174182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:21 +00:00
Bill Yi
2036b1873c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57a2a0dcb836119e48d63874ec6ed77715cab344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:17 +00:00
TreeHugger Robot
722272143c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic3a2da03399dc35e01360df7c323cb3b5b68808c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:10 +00:00
Bill Yi
26d22ef04d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1286629b18bae7a7a76bd4c96fc3b3d33cf559db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:00 +00:00
TreeHugger Robot
725c53880a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-06 22:36:20 +00:00
TreeHugger Robot
e852811d18 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-06 22:36:20 +00:00
TreeHugger Robot
4154883a76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25682928f11c3910529d7b678e5de23135d10386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:16:18 +00:00
Bill Yi
14477b9d65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I515632ed85faa537ad76adff45c98b4b1e62f2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:16:04 +00:00
TreeHugger Robot
6769eee779 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-06 21:03:12 +00:00
TreeHugger Robot
18675f81a0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-06 18:47:52 +00:00
TreeHugger Robot
3837351d59 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-06 18:47:52 +00:00
TreeHugger Robot
21b98d4cbf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-06-06 18:41:19 +00:00
TreeHugger Robot
fc5802934b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-06-06 18:41:19 +00:00
SongFerngWang
64430ba2d2 Unable to enable the removable esim
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.

Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-06 17:56:25 +08:00
Raphael Kim
0a5f62976c [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: I985362cf5320eff9611095da1383b605ea0b6cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 09:11:20 +00:00
Raphael Kim
a2b94beca8 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Ib29e5d311bf6f13e6ecc06d55d72a56c2d93e246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 08:53:57 +00:00
Raphael Kim
aa31e245ab [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

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

Change-Id: Icfb23e771f8b8c77ca426f5c448227b6181cf72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 08:32:35 +00:00
Raphael Kim
fbfa9e2df7 Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I8e0a51ca890273ffa537f3e94372ba48a8e715d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 08:15:46 +00:00
Raphael Kim
8da96d69dd Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I5ba1ef5a3a708c14b9fb739753e83d923b98b1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 08:15:08 +00:00
Raphael Kim
6d5ea9e89a Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ie914a7dc51267245d8f7f919b1ed68040032fe63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 08:00:18 +00:00
Raphael Kim
d6353487cf Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I3825280fafc93e56ef239bf70d72b0bb56544f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:50:25 +00:00
Raphael Kim
84bafc9fda Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I13426af81ec5970befc29118f883a08d28c8a986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:32:26 +00:00
Raphael Kim
839ce544aa Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ic145c489bd89fbc822ee48bfc14193c62321d355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:14:41 +00:00
Raphael Kim
94683c61b1 Merge "Extract app label from component name in notification access confirmation UI" into qt-dev 2022-06-05 01:54:28 +00:00
Bill Yi
106e52ca92 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I052e09e19a9d145d401e0152346ebe7f0e7f2a36
2022-06-04 01:26:51 -07:00
Bill Yi
96fda27ccb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7b60a0fb4183522545dcf50eae9cd8f1f38a6c1d
2022-06-04 01:23:16 -07:00
Bill Yi
aa1b476569 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic528a7fd27a359811be598d1b08467ee883e7b1a
2022-06-04 01:05:23 -07:00
Bill Yi
d3dc439a10 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idbd661c3b6a62971ef7ee40430437aac416cccdc
2022-06-04 00:58:31 -07:00
Bill Yi
2b6409fe37 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6476c920020034a0b118ca3d73a10860cd178f51
2022-06-04 00:51:40 -07:00
Bill Yi
c36c8eef75 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7907d46ed6cd5416548da57698f32a344f83ba7a
2022-06-04 00:40:55 -07:00
Bill Yi
379c2f0774 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I965dcde2e137479f7a30733f635b8cfd466c93ad
2022-06-04 00:36:26 -07:00
Arc Wang
e4771d0706 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours am: 12f11b0683 -s ours am: ab3adbd4dd -s ours am: 1732408586 -s ours am: a80076e2f3 -s ours am: 1d71f3e2af -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

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

Change-Id: I90dfebd32d6424832568fd0f807144f1ccf37535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:58:44 +00:00
Tsung-Mao Fang
5fd3f89a33 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours am: 2224883488 -s ours am: 2a665430e2 -s ours am: 2e3f8a30a1 -s ours am: 2abeb254ea -s ours am: 9c070af470 -s ours am: e025e77430 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I131a5b7edc178694dc1d9c9e35075d341ab34227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:58:43 +00:00
Arc Wang
2a36e2f772 [automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304 am: 58880a0bef -s ours am: 1e688667ba -s ours am: 1da60c2f31 -s ours am: 4129c273cc -s ours am: 7c863fb69d -s ours am: 4560b69963 -s ours am: d1135c52b3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iffe3c7383e3717cee73fa700f8dd4dc331f1ced8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:58:42 +00:00
Arc Wang
1d71f3e2af [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours am: 12f11b0683 -s ours am: ab3adbd4dd -s ours am: 1732408586 -s ours am: a80076e2f3 -s ours
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

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

Change-Id: I410e4b0ff40a7e9ab5922b4542314b09e7e2dea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:33:32 +00:00
Tsung-Mao Fang
e025e77430 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours am: 2224883488 -s ours am: 2a665430e2 -s ours am: 2e3f8a30a1 -s ours am: 2abeb254ea -s ours am: 9c070af470 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibbc64f16dd0303d4ca59a321486e1bb16b934654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:33:30 +00:00
Arc Wang
d1135c52b3 [automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304 am: 58880a0bef -s ours am: 1e688667ba -s ours am: 1da60c2f31 -s ours am: 4129c273cc -s ours am: 7c863fb69d -s ours am: 4560b69963 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icdc188bafc752618012a111427f1d72cd0710002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 02:33:28 +00:00