TreeHugger Robot
81ffe66488
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a
-s ours am: c00d5a7f5d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: If979eaa0cd9e5d825fe6f52c4799c3a5339eb010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:48:33 +00:00
Bill Yi
1c73653383
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898
-s ours am: d753deda12
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: Ie15e8dfadc34ebdee28720e5e5c18c376d2d4fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:48:27 +00:00
Bill Yi
bec60237b0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891
-s ours am: 3f823f660a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19011703
Change-Id: Ib85eb4c0123850334bb87382fd79c012fbe90cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:48:20 +00:00
TreeHugger Robot
9ea3a54355
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a
-s ours am: 16a6989a3e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: I40c50c61a9e4ce33eb867899a4889dda6ed2fe04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:40:00 +00:00
Bill Yi
3a2fbdc7da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898
-s ours am: 8c356181d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: I602d25b39aaf22343d1e83a6c15a828ce742bf6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:39:53 +00:00
Bill Yi
414f01583d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891
-s ours am: ba3e9a0be7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19011703
Change-Id: I196d973fb387245a7a1457027559e299385502db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:39:47 +00:00
TreeHugger Robot
c00d5a7f5d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: Ib3dea3a493038f22ed97886bd0c25b6373777056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:39:20 +00:00
Bill Yi
d753deda12
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: Ie5f49d9c904c50b3b92e3892107b3617986ccb9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:39:15 +00:00
Bill Yi
3f823f660a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19011703
Change-Id: I9c75de2e6515a2d7fe252960d660b1d1bc03c860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:39:06 +00:00
TreeHugger Robot
16a6989a3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: Id68dad65a41f070989c3af1eb9a771ac36694d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:23:39 +00:00
Bill Yi
8c356181d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19012175
Change-Id: I7bc9900be8bff52607e50c04e5101bf155722e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:23:33 +00:00
Bill Yi
ba3e9a0be7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19011703
Change-Id: Ib124601d7cf447559e33a4e6b863c0d6ad33aff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:23:24 +00:00
TreeHugger Robot
d9fba9380a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-21 16:17:20 +00:00
Bill Yi
1b92a98891
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6239cc468a57eec0e714dab336bf2a913b54267e
2022-06-21 04:15:29 -07:00
Bill Yi
fabd8de898
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I99e5ebe3a8c58c3c9dd9ba74a3081aed861c859b
2022-06-21 04:11:01 -07:00
Bill Yi
382bed292d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3c1724acd927e61e022d74d348092d256d2072ed
2022-06-20 23:19:45 -07:00
Bill Yi
2714015bac
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I09a80efa89b4558201beeb22aa7c854b2e86096e
2022-06-20 23:15:51 -07:00
SongFerngWang
6426382e90
The UI only shows the active LE device
...
At the media device, it only shows the active LE device which is
connected.
Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
2022-06-20 21:30:34 +08:00
TreeHugger Robot
3f614f5c54
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 90884f3225
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984486
Change-Id: I3e9421a0dd7805e415d87a484c5080e4f118542c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:20:09 +00:00
Bill Yi
ad1e8e9f68
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2652464d7c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984486
Change-Id: Ic6953c85f2af7cc87468901268c8287083cd58b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:19:36 +00:00
Bill Yi
96145d451d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f
-s ours am: 4066539cc9
-s ours am: 85204b39fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984487
Change-Id: Iad29b8eec2fb502d809293de0dda1b93b06262ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:13:07 +00:00
Bill Yi
81a60e63a6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f
-s ours am: 4066539cc9
-s ours am: d32b801680
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984487
Change-Id: Ib153751687b7a738ee48112eb6e41059730e4a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:11:29 +00:00
Automerger Merge Worker
1431470bdb
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d
-s ours am: 3caf5ab605
-s ours" into tm-d1-dev-plus-aosp
2022-06-20 08:11:02 +00:00
Bill Yi
53100dbc0b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d
-s ours am: 3caf5ab605
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18983544
Change-Id: I55a5cfc8ee7beac3b81268ef88252961abeb3675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:09:27 +00:00
Bill Yi
9d8b5bae6b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d
-s ours am: 12d891d823
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18983544
Change-Id: I42a13822784c9477c351105c7eae9327609be96c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:07:58 +00:00
SongFerngWang
30b7bef042
Fix the NullPointException am: 5a4df243f0
am: 5221cb21bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546
Change-Id: I6d673502a90eac66c9787c278f5893dbf88e7273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:06:53 +00:00
SongFerngWang
4f17ad5140
Fix the NullPointException am: 5a4df243f0
am: fd583a0459
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546
Change-Id: Id3236ff87e3a57cba5ee4afdfbb329e2c83fd19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 08:06:25 +00:00
TreeHugger Robot
90884f3225
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-20 07:40:11 +00:00
Bill Yi
85204b39fd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f
-s ours am: 4066539cc9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984487
Change-Id: Id627f73cebdb6c2192ed74ef77e68381b5342870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 07:35:58 +00:00
Bill Yi
d32b801680
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f
-s ours am: 4066539cc9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984487
Change-Id: I06f07b7b02f0901e7a68bdad53e88608e5e6eb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 07:35:23 +00:00
Bill Yi
3caf5ab605
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18983544
Change-Id: Ie1defe5780a660c7ab64d607407a7b73de010fa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 07:31:35 +00:00
Bill Yi
12d891d823
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc0d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18983544
Change-Id: I7fdb09f6363a6ba36ff1907de0146ff7406163a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 07:30:37 +00:00
SongFerngWang
5221cb21bd
Fix the NullPointException am: 5a4df243f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546
Change-Id: Ifcb7bb32737ee460e8ddbcf7730426017fc018db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 07:28:03 +00:00
SongFerngWang
fd583a0459
Fix the NullPointException am: 5a4df243f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18921546
Change-Id: Icb8aae31d833d27bb64040af296f096471838785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 07:27:56 +00:00
Bill Yi
4066539cc9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e00a15d95f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18984487
Change-Id: I10ea6e14ee85058126a4fedee4265fd4b651e4fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-20 07:24:43 +00:00
Oriol Prieto Gasco
f528e7de49
Use com.android.bluetooth as the BT stack APK
...
Test: TH
Bug: 236187653, 236192423
Change-Id: Ia86d195780a4994607b5533420cb72bd458d4f9a
2022-06-19 23:06:06 +00:00
Bill Yi
e00a15d95f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0be2cdb059a4b42e7a9f73d91ca859c9832a3bb3
2022-06-18 19:47:16 -07:00
Bill Yi
2652464d7c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I16bb20a52a58676aece02d01575bc32d710f5cd6
2022-06-18 19:29:15 -07:00
Bill Yi
980d88cc0d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8e73269e1f3bd05c9ffbeb56659b9d1bac5aad55
2022-06-18 19:20:22 -07:00
Bill Yi
49b4ab94b7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8f85c7cccfc1b44e604611c4499245812136ea1d
2022-06-18 18:57:39 -07:00
Treehugger Robot
ba91f1d310
[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c98
-s ours am: 29531e9296
-s ours am: 42a9ac3a7c
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2130212
Change-Id: I45dd030f41ad1d845653d3767bec62fc9cb8bf1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 22:03:29 +00:00
Xin Li
9f4d399062
[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad92
-s ours am: a3ca7b04eb
-s ours am: 39dd57ee3a
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2130212
Change-Id: Ibe201c915c050cd35cd4fa3aa45c10f35c8ad431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 22:02:36 +00:00
Treehugger Robot
42a9ac3a7c
[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c98
-s ours am: 29531e9296
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2130212
Change-Id: Iff96edc9a2fda29fbeba6650aa1edf54d23ac238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 21:28:27 +00:00
Xin Li
39dd57ee3a
[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad92
-s ours am: a3ca7b04eb
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2130212
Change-Id: Ie9f798529f14ac40361f03583c5f2d3acda169e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 21:27:27 +00:00
Treehugger Robot
29531e9296
[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 2b57ca5c98
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2130212
Change-Id: I5992b8ca6c5293098ff6d8f3f5ebfd09415de471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:07:25 +00:00
Xin Li
a3ca7b04eb
[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 25fdacad92
-s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2130212
Change-Id: Ie4d02f376d95fdd7ce9c3c54746e32b3df2f18e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 20:06:31 +00:00
Xin Li
2acfc5cd2e
[automerger skipped] Merge "Merge Android 12 QPR 3" am: a258d7760f
-s ours am: 403c3de881
-s ours am: 4642c65d0a
-s ours
...
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2126121
Change-Id: Id2b7c26eef93da3103a5987ac27397ac8f5e535a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:57:34 +00:00
Xin Li
51b8b7df31
[automerger skipped] Merge Android 12 QPR 3 am: d6c80bd8e3
-s ours am: 8d42cc939b
-s ours am: a073091919
-s ours
...
am skip reason: Merged-In Ie1e14a6b697af624854a9360a60383fac63bb02c with SHA-1 a5a729f523
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2126121
Change-Id: I341af91e5ee8a61f2ade685d1e503bc0279cbcae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-17 19:56:19 +00:00
Treehugger Robot
2b57ca5c98
Merge "DO NOT MERGE - Skip SQ3A.220605.009"
2022-06-17 14:29:01 +00:00
Xin Li
25fdacad92
DO NOT MERGE - Skip SQ3A.220605.009
...
Bug: 236045730
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Change-Id: I7ea531b8f0c9f1adad00b497ae6033531416905d
2022-06-16 22:50:46 -07:00