Avinash Vadlamudi
26e3744221
Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev
...
* changes:
Rename method for better readability
Fix the Ephemeral guest mode UI bugs
2022-06-08 04:03:11 +00:00
Bill Yi
c4a1f97025
[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: Ic7cf3d05fe64e8e19bfc950365e3d210155a76dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 03:48:30 +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
TreeHugger Robot
909b62ffa4
Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev
2022-06-07 18:16:32 +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
Edgar Wang
7ab5a44498
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: I3d2bdadb80d2a1189e8e7e69d883ac2f4763bbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:58:36 +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
1f6334825f
Merge "Recalculate view's height when tab is selected" into tm-dev
2022-06-07 04:17:39 +00:00
TreeHugger Robot
303c6f3cac
Merge changes I0ea498d2,I2d650eb3,I8adcf27e into tm-d1-dev am: 671c65235c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740333
Change-Id: I30105608cf552ec60582cb296179b9cd94b6d66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:00:25 +00:00
Alice Kuo
b8b79e0574
Unify the LE audio string and refine the layout to put LE audio switch together am: ed1a79a97e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740332
Change-Id: I2200a81b0d63cc690b475e5eed43e6f3e9f49ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:00:24 +00:00
Alice Kuo
b045c57fe6
Add LE Audio feature switcher in the developer option menu am: 948b7cb959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740331
Change-Id: Ia0fa92a5061bdb75a648dbb3d8db9fd2bcbdb1a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:00:22 +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
150bdf72ee
[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: Icb944e8a97433fe3cfb19bd0f5676828267f02ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:41:54 +00:00
Bill Yi
f190bf482e
[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: I5c7f9d6cdde40aeccbfda9ac03397f9e20211123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:41:50 +00:00
TreeHugger Robot
5018fa585f
[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: I2e222d6f066439628e05276ac48eacf8f03ec8b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:41:44 +00:00
Bill Yi
3d24ab77c4
[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: Ia32a0c98a122030268e1a52ab1ad7d62eb4974d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:41:36 +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
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
5afb322f3a
Merge "Restrict network preferences settings" into tm-qpr-dev
2022-06-06 21:42:30 +00:00
TreeHugger Robot
adde365e6e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779
-s ours am: 4154883a76
-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: I34e6707b67cea4d76a0a8dfeb27998007ff69ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 21:33:52 +00:00
Bill Yi
7eafff0852
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10
-s ours am: 14477b9d65
-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: Ie271b0f155ea246b5a9795377e24b8698d00ac16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 21:33:40 +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
Weng Su
a09c33f49c
Restrict guest user to configure WiFi access points
...
- If the user is not allowed to configure Wi-Fi access points, close WifiDialogActivity.
Bug: 226133034
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest
Change-Id: I32d0c5beceb8a140a98636a5a0af97790495620d
2022-06-07 03:30:01 +08:00
TreeHugger Robot
2487eb86dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 18675f81a0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745706
Change-Id: If711a5ba7c805cb898ff025288141359d44b3642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 18:55:14 +00:00
Bill Yi
42929a4e42
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa1b476569
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745706
Change-Id: Id2483a5f93be4f0f55cdaeacfa635ed20a5b245a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 18:55:04 +00:00
TreeHugger Robot
c24151d95a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3837351d59
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745571
Change-Id: I82543e4ca57e2bf1d9d29f050bb884f4561b2c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 18:54:49 +00:00
Bill Yi
74ada3e8a7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6409fe37
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745571
Change-Id: Ie5e8aec31403e59ecb7ddb1be9bffca958f361d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 18:54:30 +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
cad01723c0
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-06-06 18:40:47 +00:00
TreeHugger Robot
b40d530a27
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-06-06 18:40:47 +00:00
Avinash Vadlamudi
5bf8cd7a09
Rename method for better readability
...
- Rename encircle to encircleUserIcon for proper readability
Bug: 231592331
Test: build, manual check
Change-Id: If9e829372834d8a5f43e4cce358e8c0975fa30eb
(cherry picked from commit 1b7e411315
)
2022-06-06 10:03:05 +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
a3b0938595
[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: 0a5f62976c
-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: I8054bc4bd97727920a4af2d2eb74ca7d4019b5af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 09:26:42 +00: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