TreeHugger Robot
ea3917df6f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-12-23 18:20:30 +00:00
TreeHugger Robot
131de319c0
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-12-23 18:20:15 +00:00
TreeHugger Robot
1f5c8ea55d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-12-23 18:20:13 +00:00
Bill Yi
778c36e32e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8615103b5a4df25008ca6ee5d3d5991a6ade0d1d
2021-12-22 17:43:28 +00:00
Bill Yi
4948c670f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib5db99d68b52f343bdc999deb666780690faec52
2021-12-22 17:39:39 +00:00
Bill Yi
bd0b96b416
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2b61f14067ea07e12fa8bdd3f88e15e9eb39dca5
2021-12-22 17:30:18 +00:00
Bill Yi
d271043a53
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I818be87c0115b75678e405d76dcd261251422473
2021-12-22 17:28:35 +00:00
Bonian Chen
59e07d18f3
Merge "[Settings] Expand the display area of PIN error message" am: 7f348f2ba9
am: d692413d83
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928382
Change-Id: I55f18581b7980da472dbbd20f843fcc03a27ea72
2021-12-22 05:03:45 +00:00
Bonian Chen
d692413d83
Merge "[Settings] Expand the display area of PIN error message" am: 7f348f2ba9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928382
Change-Id: I89ab03dd12306cbcdf1460c9c940253ba0c2b67b
2021-12-22 04:27:08 +00:00
Bonian Chen
7f348f2ba9
Merge "[Settings] Expand the display area of PIN error message"
2021-12-22 04:08:18 +00:00
TreeHugger Robot
43b16debdb
[automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c
-s ours am: 634a94b899
-s ours
...
am skip reason: Merged-In Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e with SHA-1 685cacb540
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16476806
Change-Id: Ie79749d487851c5f5a8709b4bc74aa899cf4e620
2021-12-22 03:57:54 +00:00
TreeHugger Robot
634a94b899
[automerger skipped] Merge "Fix USB tether option" into sc-dev am: 15afdd803c
-s ours
...
am skip reason: Merged-In Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e with SHA-1 685cacb540
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16476806
Change-Id: I3cd73f0e78e5c00e1680e3f335e7f9fc3ce98c56
2021-12-22 03:43:31 +00:00
TreeHugger Robot
15afdd803c
Merge "Fix USB tether option" into sc-dev
2021-12-22 03:27:13 +00:00
TreeHugger Robot
02e50b1caf
[automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d
-s ours am: 1c0b3b0a7d
-s ours
...
am skip reason: Merged-In I3caefc7e1ca10dadcad114273edf35d9309502e1 with SHA-1 35803a3b03
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723689
Change-Id: Ibace7dcd9903a97629354e3e66673e57edf6be7a
2021-12-22 03:18:22 +00:00
TreeHugger Robot
1c0b3b0a7d
[automerger skipped] Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev am: da8ab6a51d
-s ours
...
am skip reason: Merged-In I3caefc7e1ca10dadcad114273edf35d9309502e1 with SHA-1 35803a3b03
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723689
Change-Id: Ic18aa6cfebdca3cc0e333f29f0a8a1e07270dcf0
2021-12-22 03:00:30 +00:00
TreeHugger Robot
da8ab6a51d
Merge "[Provider Model] Add cutout for signal icon if the mobile data is disabled" into sc-dev
2021-12-22 02:43:04 +00:00
Xin Li
45c581df53
[automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802bb3
am: 3be43ae165
-s ours
...
am skip reason: Merged-In I84848a2801172b46f7cc3ff39d88ad57e34514a4 with SHA-1 050b6d5224
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1930705
Change-Id: I6fc2e4a1c103c7efad592eb468a441795c267e07
2021-12-21 07:20:47 +00:00
Bonian Chen
48c945e9b5
[Settings] Expand the display area of PIN error message
...
PIN error message when user operating on PIN lock got long text string.
Which not fit into 2 lines of display area.
This is a change to expand the display area to max. capacity but remain
tightly wrap the text.
Bug: 211176734
Test: local
Change-Id: If175a53de4646d2479b15b10f6b59e4e0870d521
2021-12-21 14:08:58 +08:00
Xin Li
3be43ae165
Merge "Merge SP1A.211205.008" am: 0bf1802bb3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1930705
Change-Id: I8ce5af67e19d864ad3951c15252b0c3496fd56d0
2021-12-21 05:21:38 +00:00
Xin Li
0bf1802bb3
Merge "Merge SP1A.211205.008"
2021-12-21 05:02:44 +00:00
Xin Li
971abb190b
Merge SP1A.211205.008
...
Bug: 205056467
Merged-In: I84848a2801172b46f7cc3ff39d88ad57e34514a4
Change-Id: I4227cf287bd7adffb3241954bd47284b7cd44fdf
2021-12-20 14:15:09 -08:00
William Escande
23ebda4c12
Add QUERY_AUDIO_STATE permission
...
This permission is added to getLastAudibleStream
Bug: 190422401
Tag: #refactor
Test: Build + start a2dp + play music + change volume from DUT/speaker
Change-Id: I65c5e6f50e7b440af57b2a0bd6656db91446578b
2021-12-20 13:45:47 +01:00
Treehugger Robot
9713bec956
Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74
am: 9c2293ca92
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621
Change-Id: I8501963b7bd636b08107a1acd1495e74b355fea4
2021-12-20 03:31:28 +00:00
Treehugger Robot
9c2293ca92
Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621
Change-Id: Ic05e38726cd2f42e919553a11eb0ce6944ce0d20
2021-12-20 03:14:04 +00:00
Treehugger Robot
a3d97ecd74
Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing"
2021-12-20 02:53:33 +00:00
Alice Kuo
27a0274d6e
Add test case - forceUpdate_deviceIsSubDevice_doNothing
...
Bug: 201472540
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: I1aef6429b39109a09931a94b61f15e9470de3854
2021-12-20 01:35:40 +00:00
Alex Johnston
6a8cbc9fac
Fix USB tether option
...
* USB tether option will be grayed out before
USB cable is plugged in.
Bug: 192225597
Test: manual testing
Change-Id: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
Merged-In: Ibc87416b9aecb03f1ddd3df0d9f11a935f3a290e
(cherry picked from commit 685cacb540
)
2021-12-15 13:57:04 +00:00
Treehugger Robot
26bf610fd9
Merge "Settings: Extend the data role swap timeout value" am: bb994f627f
am: df2a22f104
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875
Change-Id: I0d456509b02715b141a6110ef89a476995ce5d67
2021-12-15 07:23:26 +00:00
Treehugger Robot
df2a22f104
Merge "Settings: Extend the data role swap timeout value" am: bb994f627f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1912875
Change-Id: I42a32278a74fd99f6f397c2c9d489f4bd94b3dc0
2021-12-15 07:06:33 +00:00
Treehugger Robot
bb994f627f
Merge "Settings: Extend the data role swap timeout value"
2021-12-15 06:49:44 +00:00
Xin Li
54916e10e8
[automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11
-s ours am: 50d6b616d7
-s ours
...
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1921978
Change-Id: I5eeeaca9b47404dafc838583ff60cabf80184161
2021-12-14 21:24:07 +00:00
Xin Li
50d6b616d7
[automerger skipped] Merge "Merge Android 12 QPR1" am: 798e3d7d11
-s ours
...
am skip reason: Merged-In Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed with SHA-1 54ee717db8
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1921978
Change-Id: I14e4d4bad0bf56de1031170010143763bcb4300d
2021-12-14 21:00:16 +00:00
Xin Li
798e3d7d11
Merge "Merge Android 12 QPR1"
2021-12-14 20:26:01 +00:00
Xin Li
475d27801f
Merge Android 12 QPR1
...
Bug: 210511427
Merged-In: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
Change-Id: I750e1a1f03c22a58637ff65825756d849ab089b5
2021-12-14 08:39:13 -08:00
Bonian Chen
718c17039e
Merge "[Settings] Fix failure test case" am: 57a7978f8c
am: 54ee717db8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457
Change-Id: I2da154061359ad72ffa736873f06052be93ed721
2021-12-14 02:46:06 +00:00
Bonian Chen
2bed540284
Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc
am: 54e4845d54
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791
Change-Id: Icba1cb39911ec1e06b3952117e95ccf03630aeae
2021-12-14 02:46:04 +00:00
Bonian Chen
54ee717db8
Merge "[Settings] Fix failure test case" am: 57a7978f8c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457
Change-Id: Idd5fcfa840e2a5cb27b5d1c1131c80dd580da3ed
2021-12-14 02:30:55 +00:00
Bonian Chen
54e4845d54
Merge "[Settings] Refactor Wifi Calling description text" am: 078f873ccc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904791
Change-Id: I9c1bd5949a1c76ef3ef97868ada3b850af5bc68e
2021-12-14 02:30:53 +00:00
SongFerng Wang
38a109d745
Merge "To disable the preferred network mode UI during calling." am: 9dec28892c
am: a74e6cd2ec
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331
Change-Id: Id3a811f5d3d37fc0e361811b27d76c8a0806c95b
2021-12-14 02:22:54 +00:00
Bonian Chen
57a7978f8c
Merge "[Settings] Fix failure test case"
2021-12-14 02:09:36 +00:00
Bonian Chen
078f873ccc
Merge "[Settings] Refactor Wifi Calling description text"
2021-12-14 02:09:36 +00:00
SongFerng Wang
a74e6cd2ec
Merge "To disable the preferred network mode UI during calling." am: 9dec28892c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1919331
Change-Id: Ibdad65e0fc67eed1f57bcf076fe5e8ea577fa21d
2021-12-14 01:58:22 +00:00
SongFerng Wang
9dec28892c
Merge "To disable the preferred network mode UI during calling."
2021-12-14 01:40:36 +00:00
SongFerngWang
ce7d4b730c
To disable the preferred network mode UI during calling.
...
It is the modem limitation, so disable the preferred network mode UI
during calling.
Bug: 206973375
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
Merged-In: Ibb2904b4c6ff6de82063862188cc57e5c14b3aa5
2021-12-14 04:16:44 +08:00
Treehugger Robot
38d4bfc954
Merge "Set the EID in the SIM status page to be copyable" am: eba925809d
am: 43c08cc42f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715
Change-Id: Ib89b68b80bbfec649ddf54b50de568c94ce8d6b3
2021-12-13 15:03:49 +00:00
Treehugger Robot
43c08cc42f
Merge "Set the EID in the SIM status page to be copyable" am: eba925809d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1894715
Change-Id: Icbf909388b53ab1846fc2fca27c7c6bb7201a3e6
2021-12-13 14:48:47 +00:00
Treehugger Robot
eba925809d
Merge "Set the EID in the SIM status page to be copyable"
2021-12-13 14:25:11 +00:00
jason thedjoisworo
5923723b4d
Set the EID in the SIM status page to be copyable
...
Add new textIsSelectable attributes to the EID textview
Bug: 210374141
Change-Id: I3b4f223319ee0ab8ae89dc2b0984ae9f9dbe32ae
2021-12-13 06:39:20 +00:00
SongFerng Wang
80aafc5629
Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c
am: 095e4093b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916818
Change-Id: If245b0d5fd4eeb161effae1c4f26c9cab6ed9860
2021-12-10 07:12:54 +00:00
SongFerng Wang
095e4093b0
Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916818
Change-Id: I33dcb20edcdd04ba2401df931ce8c345341ce3d2
2021-12-10 06:57:58 +00:00