Simon Wingrove
4884157649
Don't trampoline twice when opening security or privacy
...
Settings already trampolines to a two-pane version of deeplink
activities, doing another trampoline will wind up creating a second task
covering up the first, with the wrong layout.
Bug: 253554698
Test: manually
Change-Id: Ib7ba5c95cac2f644ade37a41f321d11c8f1d1b89
2022-10-17 14:55:51 +01:00
Bill Yi
10685ce812
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I52af69635563e5f832ff9b2db1988ab1a0b8947a
2022-10-15 15:51:11 -07:00
Bill Yi
8b6197643d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9e456fa02748875d1d19cb5e74440837eb5c6ba0
2022-10-15 15:45:37 -07:00
Julia Tuttle
e9108aecd8
Default to hiding silent notifications on lockscreen in Settings
...
Also, fix an errorprone issue.
Bug: 252815574
Test: atest ShowOnLockscreenNotificationPreferenceControllerTest
Change-Id: I46e6d0f15c69abe60ef8505d300e5205b3c71e53
2022-10-15 01:24:19 -04:00
Betty Chang
b2269caa45
Merge "[LE Audio] Add LE Audio Devices in Sound Settings" into tm-qpr-dev
2022-10-15 04:38:00 +00:00
changbetty
1096417464
[LE Audio] Add LE Audio Devices in Sound Settings
...
- When connected to the LE Audio Device, it will display "Play XXX on
LEAduioDeviceName" in Sound Settings.
- When connected to the LE Audio Device, it will display the LE Audio
device name in the "Take call on" list for you having a active call(Hands Free).
- Remove the @Ignore annotation for all the tests and make test
cases pass.
Bug: 240911615
Bug: 243494881
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AudioOutputSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HandsFreeProfileOutputPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaOutputPreferenceControllerTest
Change-Id: I10db59b33623495a9e9933556c78e20d81e405ea
2022-10-14 06:10:52 +00:00
SongFerngWang
7087388a0f
[LE unicast] Using the pairDeviceByCsip API
...
ag/20176285 changes the API flow.
Bug: 253541065
Test: make RunSettingsLibRoboTests ROBOTEST_FILTER=CachedBluetoothDeviceManagerTest
local test and result is on bug (pass)
Change-Id: I2354b464a93b3122b462dc9cc20556f621490d2a
2022-10-14 04:43:39 +00:00
Julia Tuttle
9f0efa68a1
Fix some out-of-order imports
...
Bug: 20188695
Test: build
Change-Id: I47d463f82bee4e1b22300eb4260dd38dbeb13c88
2022-10-13 21:55:46 -04:00
Chloris Kuo
236eaed326
Disable Enhanced notifications setting when default NAS is not available
...
Test: NotificationAssistantPreferenceControllerTest
Bug: 251400808
Change-Id: Idec520013bea32cfaea0285f33c525a6e37f0124
(cherry picked from commit 873b8544e1
)
2022-10-13 16:27:35 +00:00
Behnam Heydarshahi
7f6c833b89
Merge "Add notification volume controller in settings" into tm-qpr-dev
2022-10-12 19:37:26 +00:00
TreeHugger Robot
689350d4d4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-12 13:38:54 +00:00
TreeHugger Robot
9b960b32e0
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-12 13:38:54 +00:00
TreeHugger Robot
38e1727150
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-12 13:38:54 +00:00
TreeHugger Robot
8859d2d131
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f4e14e153b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149152
Change-Id: I3c72497e940e6341d2809211f64fa86a3b56bbe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 07:25:53 +00:00
Bill Yi
46ef926c7d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1ec1e30df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149152
Change-Id: Ic6477cc86daa19ec48e92d6222fb3324e2be7a93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 07:25:51 +00:00
TreeHugger Robot
fccca2d569
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4cddf997d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149148
Change-Id: Ie4cc6ec27b864db263062e9b809097d4878c754c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 07:25:50 +00:00
Bill Yi
ec126d93fe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ff3434900
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149148
Change-Id: I0f90720eb10a668f7632e3d5186eac99f8e6aee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 07:25:31 +00:00
TreeHugger Robot
2f4c15f95f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 24c7d47de2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149139
Change-Id: I0d06f2f9223c867a1daf8adf359e83822e6bbafe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 07:25:09 +00:00
Bill Yi
ce885622a7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 171a00478b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149139
Change-Id: Id928ba7eebb872e2e39e97ec3b6dab94685edd44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-12 07:24:48 +00:00
TreeHugger Robot
f4e14e153b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-10-12 06:55:58 +00:00
TreeHugger Robot
4cddf997d6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-10-12 06:55:58 +00:00
TreeHugger Robot
24c7d47de2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-10-12 06:55:58 +00:00
Tim Peng
67537336a6
Merge "RESTRICT AUTOMERGE Refactoring settings UI" into tm-qpr-dev
2022-10-12 06:01:43 +00:00
Josh Hou
9c2e35244d
Merge "[Panlingual] Separate the app locale information by profiles" into tm-qpr-dev
2022-10-12 05:03:52 +00:00
SongFerngWang
c27b674e38
[MEP] the user can't enable the psim when revmovable esim is enabled
...
The isRemovableSimEnabled method at ToggleSubscriptionDialogActivity
UI is for psim, not esim. It should skip the revmovable esim slot.
Bug: 251384644
Test: build pass. atest UiccSlotUtilTest
Change-Id: I11d0f9528961ec5e47cd8682cf9b6bb988a5700f
2022-10-11 18:48:36 +08:00
Hugh Chen
f891f7ba86
RESTRICT AUTOMERGE Refactoring settings UI
...
Bug: 248174653
Test: build & boot pass
Change-Id: I124a65941349d3338145865cae2c8354678897fa
2022-10-11 04:30:09 +00:00
TreeHugger Robot
d1dd16222b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 19971433a3
-s ours am: 8b00fad21e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149150
Change-Id: I65af0311cdccfe8f05fcf9be872f149f016f66b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-10 23:08:15 +00:00
Bill Yi
27d2c1d387
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707
-s ours am: 3f4d598606
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149150
Change-Id: I8ccd673e056f7af62f3f5e41850de5b74d0029aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-10 23:08:11 +00:00
TreeHugger Robot
4c021c6b06
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18
-s ours am: eac07869ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149146
Change-Id: I10728a72771cc0f91ea80b6c45aaf390cc2d5717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-10 23:08:07 +00:00
Bill Yi
272b07dd04
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10
-s ours am: cbf161d09b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149146
Change-Id: I20839438a4f393b2a8f5a7a7e62e9a6776d82d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-10 23:07:52 +00:00
Bill Yi
d7cf3b29e3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c
-s ours am: 18560c1147
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149138
Change-Id: Ia137801aaf7dba6bb87650ea3a2713101b10002d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-10 23:07:35 +00:00
TreeHugger Robot
8b00fad21e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 19971433a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149150
Change-Id: Icd1ebe8d26a339ab3d01f58889bced1c076c08ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-10 22:55:54 +00:00
Bill Yi
3f4d598606
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 177fea7707
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149150
Change-Id: I99576a09003f7054302d712cc2d2bc00547b7f3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-10 22:55:49 +00:00
TreeHugger Robot
eac07869ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: afe5f1ac18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149146
Change-Id: Ic7b000cb3eac10b6306ad2264f27aa51857614db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-10 22:55:44 +00:00
Bill Yi
cbf161d09b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4ba8745b10
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149146
Change-Id: I19aebde57d029ede5dd629754c31ecfffff930ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-10 22:55:26 +00:00
Bill Yi
18560c1147
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 467155435c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20149138
Change-Id: I0fce25558bdfc28f03002c457e65d817011c8c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-10 22:55:14 +00:00
TreeHugger Robot
19971433a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-10-10 22:14:13 +00:00
TreeHugger Robot
afe5f1ac18
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-10-10 22:14:13 +00:00
Behnam Heydarshahi
3ac6aaf796
Add notification volume controller in settings
...
Separate notification and ring controllers based on the ring/volume
stream alias boolean in config.xml.
For both ring and volume controller: Not show vibrate icon when vibration is not supported on device. Show
silent icon instead.
Known issue: Add the notification volume slider only in Settings, and
not in VolumePanelDialog. When the alias is set to false and the streams
separated, the ring volume slider in VolumePanelDialog keeps its title
of "Ring & notification volume" instead of changing to "Ring volume".
Bug: b/38477228
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest RunSettingsRoboTests -j40
make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=RingVolumePreferenceControllerTest RunSettingsRoboTests -j40
make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=SoundSettingsTest RunSettingsRoboTests
Change-Id: Id17523f49b291a5cf612b90f93c3b2ab6486c62f
2022-10-10 14:42:56 +00:00
Bill Yi
a1ec1e30df
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3af7cdfeb330c352ea352e08484cf4f8eb9d8890
2022-10-09 20:44:05 -07:00
Bill Yi
8e5a2508d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2059426b17b50acca54064684c5d5fb52b6d96e4
2022-10-09 20:43:13 -07:00
Bill Yi
177fea7707
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I84d0bcacb71f88a68f961d2d1cf83b8df1bdcdaf
2022-10-09 20:42:21 -07:00
Bill Yi
3ff3434900
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4d08d5d8e1745590996ec0b940bc587bcb92eec2
2022-10-09 20:40:28 -07:00
Bill Yi
e729683b8f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7a42785ad43d43c8185c6ba06fd40672bb674b13
2022-10-09 20:37:39 -07:00
Bill Yi
4ba8745b10
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I95d0d47182909547a30671ac207bc59a5769db98
2022-10-09 20:34:46 -07:00
Bill Yi
171a00478b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5080ea8ef088ac3455bd258df08e64823f5bf5b5
2022-10-09 20:28:54 -07:00
Bill Yi
3f2f1212a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I23abdb70990b8472d4e2ee881a89df083cf064a6
2022-10-09 20:27:40 -07:00
Bill Yi
467155435c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I30d81e9920cda4cd5d07a1f07456c37b2ac94da3
2022-10-09 20:26:30 -07:00
TreeHugger Robot
4fd86cc096
Merge "Do not show 2nd FingerprintErrorDialog" into tm-qpr-dev
2022-10-08 06:54:15 +00:00
TreeHugger Robot
d776340d33
Merge "overridePendingTransition in FingerprintSettings" into tm-qpr-dev
2022-10-08 06:53:35 +00:00