Treehugger Robot
bef728d2ff
Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300
Change-Id: Icf6b8698aa4f01e89076fc0566f5d71ef35c1742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-15 17:35:36 +00:00
Treehugger Robot
79e1afbdfa
Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed"
2022-06-15 17:12:06 +00:00
Bruno Kremp
b16ac39ee1
Keep setting of "TurnOff hotspot automatically" when AP is changed
...
When AP config is changed, setting of "TurnOff hotspot automatically"
will be reset to default. Hence keep the setting when AP config changed.
Keep setting of whether auto shut down is enabled when AP
config changed.
Co-authored-by: Fangxiao Cao <fangxiao.x.cao@sony.com >
Test: manual test
Bug: 235370570
Change-Id: Ibd3d59b6a86edaf1253a2c9b035576e60a7beb96
2022-06-15 09:20:18 +02:00
SongFerng Wang
a5a729f523
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199
Change-Id: Ie1e14a6b697af624854a9360a60383fac63bb02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 06:59:22 +00:00
SongFerngWang
fbfaa331d2
Unable to enable the removable esim am: 56e1297abe
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121195
Change-Id: I02f2599c790c90a0b602b84bc8b511f521a7e906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 06:59:21 +00:00
SongFerngWang
da2d1d85aa
Reuse the active esim slot am: 887bb592c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121194
Change-Id: I273a609f8f615c9e74fbf416c859b5159ca420c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 06:59:20 +00:00
SongFerngWang
886193184d
stop show preferred SIM card dialog during sim switch am: faf9baf95b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121193
Change-Id: I3222b73bf7e01f30a56ba53cba04ed6cba45a608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 06:59:17 +00:00
SongFerng Wang
8be3ebd163
Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4
...
* changes:
[MEP] Modify the comments
Unable to enable the removable esim
Reuse the active esim slot
stop show preferred SIM card dialog during sim switch
2022-06-14 06:34:07 +00:00
Gil Cukierman
fecd7c1c1a
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I6ceccc283e4065fb94b2cf0c741905be40b31c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 19:48:40 +00:00
Gil Cukierman
778d851165
Merge "Improve documentation of Enable2gPreferenceController"
2022-06-13 19:03:49 +00:00
SongFerngWang
e63dfcbd90
[MEP] Modify the comments
...
Bug: 235792308
Test: build pass
Change-Id: Idf0ce19814ce8b23bc1eea864b36815203069f87
2022-06-13 18:24:30 +08:00
SongFerngWang
56e1297abe
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
Merged-In: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-13 17:49:00 +08:00
SongFerngWang
887bb592c8
Reuse the active esim slot
...
If there is the active esim slot in SS mode, the settings should
reuse it and does not change the sim slot mapping.
Bug: 229803628
Test: manually test.
Change-Id: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
Merged-In: I6daa38f54abfaf67c7640d9dc8be0da02eb59554
2022-06-13 17:48:34 +08:00
SongFerngWang
faf9baf95b
stop show preferred SIM card dialog during sim switch
...
Bug: 227169390
Test: manually test
Change-Id: I242402e49b267c8cd61a85a46367c778d2d8bbf8
Merged-In: I242402e49b267c8cd61a85a46367c778d2d8bbf8
2022-06-13 17:48:24 +08:00
Gil Cukierman
55e8d38038
Improve documentation of Enable2gPreferenceController
...
Test: javadoc changes only
Fix: 235251754
Change-Id: Ieee483fdbeac3e581085c1a776974f82090743bc
2022-06-09 13:47:45 +00:00
Treehugger Robot
110c20fff0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe38e396b2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115721
Change-Id: I219fdf84a32d625cc1db2a8cad3f0e2fad99a630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 19:20:01 +00:00
Bill Yi
30d09d7e03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 908d98e833
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115721
Change-Id: Id6cb0c78ac4a1fff67ad24036e65b670f5a8429c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 19:19:37 +00:00
Treehugger Robot
75cadf738b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c2d1ef5127
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115720
Change-Id: I457f144c16992753458de5d48f16ec254f9a336a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 19:19:19 +00:00
Bill Yi
910530931f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ddfc8853
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115720
Change-Id: I44cb030d201c6df90d090ff8234522498911a1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 19:19:06 +00:00
TreeHugger Robot
95b4c4798d
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-06-06 18:42:20 +00:00
TreeHugger Robot
059271dcc4
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-06-06 18:42:20 +00:00
Treehugger Robot
fe38e396b2
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-06-06 18:31:02 +00:00
Treehugger Robot
c2d1ef5127
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-06-06 18:31:02 +00:00
Treehugger Robot
4494e0fcfe
Merge changes I0ea498d2,I2d650eb3,I8adcf27e am: 2bec16eda0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2115174
Change-Id: Ia42f377f4688deb033a87d7ea47e9c4194980517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 06:52:27 +00:00
Treehugger Robot
2bec16eda0
Merge changes I0ea498d2,I2d650eb3,I8adcf27e
...
* 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-06 06:37:11 +00:00
Bill Yi
908d98e833
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I145b5d3d391fc5d326980ca80d7288287bfd6996
2022-06-05 22:20:46 -07:00
Bill Yi
36ddfc8853
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8eda8d180aabb5f47b910e3ec312396fd207e308
2022-06-05 22:17:02 -07:00
Bill Yi
88b4a11c90
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I81fb26845d241e6c415fb5e57c8a96622c01e4bc
2022-06-05 21:57:47 -07:00
Bill Yi
71660567f7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5c968be7dc8df7de1548f9e84940619e2dfa970e
2022-06-05 21:54:11 -07:00
Alice Kuo
f71b2ea56e
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
2022-06-03 11:53:33 +08:00
Alice Kuo
b13abc03dd
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
2022-06-03 11:52:50 +08:00
Betty Chang
d131bdfbec
Merge "[LE Audio] Broadcast Sink UI" am: e3295efcd0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2113244
Change-Id: I4d58377302a60869bce6cd4d2a70a6f61d35e752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 04:01:11 +00:00
Betty Chang
e3295efcd0
Merge "[LE Audio] Broadcast Sink UI"
2022-06-02 03:34:59 +00:00
changbetty
a7b89ba24b
[LE Audio] Broadcast Sink UI
...
- Add dialog for Broadcast and find broadcast source
- Add Activity for find broadcast source
Bug: 228274114
Test: Manual test
Change-Id: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
Merged-In: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
2022-06-01 06:40:07 +00:00
Alice Kuo
0d11fd07e7
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
2022-05-31 18:11:58 +08:00
Zoey Chen
bd8c589390
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" am: 31011d591f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107987
Change-Id: Iee27c40089c612cd2e9ac80a4fa218d707fffd0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-31 03:57:00 +00:00
Zoey Chen
31011d591f
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings"
2022-05-31 03:27:51 +00:00
Treehugger Robot
2341b91f32
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346
Change-Id: I3435e3bf2ee61ad4be971334f791543d9c26856d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-30 03:27:45 +00:00
Treehugger Robot
24f96c2c2e
Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info"
2022-05-30 03:01:23 +00:00
SongFerng Wang
640e337b19
Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107797
Change-Id: Idcc44c3a8d41c74cb485c5cba0764989adc17a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:18:30 +00:00
SongFerngWang
5de8fbc299
Changing the condition since the esim may be removable am: 82bf2a66b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107795
Change-Id: If58f4e897785dd92ed6de2bd847bb5a7a9728294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 15:18:28 +00:00
SongFerng Wang
d3a7c75487
Merge changes Ic2ac6a5c,I47dc068e
...
* changes:
[MEP] The removale slot can read the esim card
Changing the condition since the esim may be removable
2022-05-27 14:59:48 +00:00
Betty Chang
e300781fb8
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" am: e5a21d345d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2107794
Change-Id: I9fedeeaf397e15e8c6a9421604a0cf6def4c743c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 14:47:51 +00:00
Zoey Chen
badca36723
[LeAudio] Remove the QrCamera and decorateView in Settings
...
Bug: 214340362
Test: Manual test
Change-Id: Ibc29f0e90af28e14a11164fa8940920745545c7e
Merged-In: Ibc29f0e90af28e14a11164fa8940920745545c7e
2022-05-27 22:39:58 +08:00
Betty Chang
e5a21d345d
Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT"
2022-05-27 14:30:02 +00:00
SongFerngWang
7d71d3f451
[MEP] The removale slot can read the esim card
...
Revert the wrong logic for removale slot part at ag/18579901,
the removable slot can read the esim card.
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719
Merged-In: Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719
2022-05-27 08:54:09 +00:00
SongFerngWang
82bf2a66b7
Changing the condition since the esim may be removable
...
The condition whether the slot is esim slot should use getIsEuicc
api since the esim may be removable.
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
Merged-In: I47dc068e57a0faa7f7ce85af7933a48caa2c93e4
2022-05-27 07:10:28 +00:00
SongFerng Wang
1ab90f4640
Merge "Settings: Change array resource sim_color_light to an integer array" am: ed0f3c60ec
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2081598
Change-Id: I308ab424ad1acf881c0106de1007393e7bf0bff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:32:46 +00:00
SongFerng Wang
ed0f3c60ec
Merge "Settings: Change array resource sim_color_light to an integer array"
2022-05-27 05:12:32 +00:00
changbetty
012527b81c
Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT
...
Bug: 214338905
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=QrCameraTest
Change-Id: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
Merged-In: I1ca3e9e0b2cdc9fd3f32da8c5329c0e887ee3427
2022-05-27 04:05:44 +00:00