Commit Graph

104757 Commits

Author SHA1 Message Date
TreeHugger Robot
2a6958bcd5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours am: 72a681dbe4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I949151ac2b0c0767b233cf38000c2e0d583c1a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:45:51 +00:00
Bill Yi
7ac1ee50c9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours am: a658060c06 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ea6367d433ad72f4a1c72cb3773870f93ff4d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:45:40 +00:00
TreeHugger Robot
72a681dbe4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbbc6bf130ea62a0f5f82acc275b2c0af17fe8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:02:39 +00:00
Bill Yi
a658060c06 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia96ac0fb6ca1bdda13d1bae629d7e1a9a6a63f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 03:02:35 +00:00
Automerger Merge Worker
955397f7ca Merge "Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 40379dd9d4" into tm-d1-dev-plus-aosp 2022-06-09 02:43:06 +00:00
SongFerng Wang
26e4bc3385 Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 40379dd9d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: I1e9704393a31afba4dc045b5f8a0cac01cc05e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:43:03 +00:00
SongFerng Wang
506f08b469 Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 8425062cef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: Ie02de937a62231f6bf41218ded791204046c59ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:43:01 +00:00
Automerger Merge Worker
d5bcf3fd1d Merge "[Setting crash] The dialog is null am: 8514ff65eb am: b6bd4143cd" into tm-d1-dev-plus-aosp 2022-06-09 02:42:57 +00:00
SongFerngWang
b8e8f9d524 [Setting crash] The dialog is null am: 8514ff65eb am: c69ee75a64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: Ic8dd54e2aa27f8d62e872f0c73e13ea6ab953fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:42:53 +00:00
SongFerngWang
d0c7fd9edd [Setting crash] The dialog is null am: 8514ff65eb am: b6bd4143cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: I0b408ceccfb1fbe774750a1a4e8582226a0ce069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:42:52 +00:00
TreeHugger Robot
8be819762f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-09 02:39:03 +00:00
SongFerng Wang
8425062cef Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: Ic113ffc982f64c332b5269275e47941d6d5c2245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:07:10 +00:00
SongFerngWang
c69ee75a64 [Setting crash] The dialog is null am: 8514ff65eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: Ib697f1fddcb8b77b36d2dc95cfa34331ded9bf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:06:56 +00:00
SongFerng Wang
40379dd9d4 Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: I6120361d42db676e02991dafd707dfa1b4188777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:05:41 +00:00
SongFerngWang
b6bd4143cd [Setting crash] The dialog is null am: 8514ff65eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: Ie9e4e661bb66dcb898b2f98435989ab838d37713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:05:21 +00:00
SongFerng Wang
be1b37ae2b Merge "Unable to enable the removable esim" into tm-dev 2022-06-09 01:30:44 +00:00
Bill Yi
fe71b2e76c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4111bd9a5feee6d6a8b5db7861d622ea893515e2
2022-06-08 14:08:50 -07:00
SongFerngWang
8514ff65eb [Setting crash] The dialog is null
Add the null protection.

Bug: 235267673
Test: build pass
Change-Id: Ib9308d152ddc233354d89166b8d79fcec81d8c19
2022-06-08 08:32:05 +00:00
Automerger Merge Worker
2775ad9caa Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -s ours" into tm-d1-dev-plus-aosp 2022-06-08 03:50:41 +00:00
Bill Yi
2b0376c226 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 537b47d74e -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: I3ce5bb254a6c4d9244c2f29c3a6ad59587438753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:48:49 +00:00
Bill Yi
17fe543e54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5 -s ours am: 131903dd2e -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: Ib4af0ce054ac96742875fcd2df1a28d163e691dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 03:48:41 +00:00
Bill Yi
131903dd2e [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: Icd6cc592217548df11b658f141d8dee124e99b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:46:47 +00:00
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
Automerger Merge Worker
2de1730ca0 Merge "Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524" into tm-d1-dev-plus-aosp 2022-06-07 04:58:42 +00:00
Edgar Wang
0d22bf453d Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 025baa318b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I56e33ea1e76d0426f15816862464a81d36934848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:58:38 +00:00
Edgar Wang
f3883c5da8 Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f am: 47b4c86524
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509

Change-Id: I264c15129aad5569e1d05e37940247c95ae4d07c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:58:38 +00: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
025baa318b 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: I831063be158b5097e3cc82e8d5db767676096811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:40:14 +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
02dead7892 [automerger skipped] Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c -s ours
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e is already in history

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

Change-Id: If223945b3c668ab61fab6b15bbdf3ae171d41120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 03:59:02 +00:00
Alice Kuo
a6b2701416 [automerger skipped] Grey out LE audio offload switcher as LE audio isn't enabled/supported am: b51ae97810 -s ours
am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 f71b2ea56e is already in history

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

Change-Id: I2dc97c6056295200799541e7f3af964e915eaa23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 03:59:00 +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
Automerger Merge Worker
d86ace768b Merge changes from topic "am-25f6a72642164283be9362e18a8e52e6" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 4322a2ffea -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 6de51e9b95 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: d3bd17b345 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 702b4bdc85 -s ours
2022-06-06 23:42:40 +00:00
TreeHugger Robot
f1e2b557bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 4322a2ffea -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: I4e36f278c03ffacafd4a88e4fe37b4eb057d9538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:42:03 +00:00
Bill Yi
d30ad5252d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 6de51e9b95 -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: I20a6367f052fb5defe74c611e48cadf0ccde985d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:59 +00:00
TreeHugger Robot
688597e471 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours am: 3de5617a68 -s ours am: 7f6ae2418e -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: If1b56ca270926c7d12f645116131e2c546d26758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:54 +00:00
TreeHugger Robot
e9509eae1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: d3bd17b345 -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: Ie97c75d2416f9b50be1a58d3b628d4a6a0bf1a07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:52 +00:00
Bill Yi
2c9fda98b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours am: 082d0f39ff -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: I8282d7a75b4f0419fcbbea89f353cf1a4e95614b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:51 +00:00
TreeHugger Robot
d11e1a39a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours am: 868a03b273 -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: Ie40bb274f4b67fa2fdd60c489bd1ddd56bbcb408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:45 +00:00
Bill Yi
5825f3efbc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 702b4bdc85 -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: I1ad2a18803893738f87d9199a7517a4435e3e004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:43 +00:00
Bill Yi
6e565398ba [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours am: 59bb14f56e -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: Ifc564a94557fb27d8dc838ce7dc753b33adc9873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:41:35 +00: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
4322a2ffea [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: Ib1e2168fa829912acd8a56b6d4912f9424c35faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:19:46 +00:00