Hugh Chen
c70937ef85
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73
am: d925f52768
-s ours am: 8d4a4b690f
-s ours am: b71cc3b9fd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330692
Change-Id: Ieb64860b140639650a9632626545c93126eb2165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:25:06 +00:00
Hugh Chen
d5d8bbd18d
[automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7
-s ours am: 1e636ad03e
-s ours am: 7bde548ee0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330691
Change-Id: Ib58173e8bdc8e2c906f1430fc0bb745fc714fea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:24:59 +00:00
TreeHugger Robot
8ebd0c1381
Merge changes from topic "presubmit-am-36bba661a52b4792a8d74b3037c240af" into sc-mainline-prod am: ff36a38719
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Change-Id: I3d5105e3416afe6d0e5acb64da61b9b2d39f0915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:24:50 +00:00
Hugh Chen
d37402a2de
[automerger skipped] [automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
am: 10bdea1a98
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Change-Id: I3dce5e69a84497905ba2c1579b827720fb4a3bc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:24:46 +00:00
TreeHugger Robot
8af957252a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9f9f0706d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18396963
Change-Id: I76baca80a92ced5c84844c648ee9b466886e7e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:20:45 +00:00
Bill Yi
ff8cd75636
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17c2fde132
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18396963
Change-Id: Ic513985f0a682f21d4934463304e179c4f752089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:20:25 +00:00
Bill Yi
803533153b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12968349f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18396754
Change-Id: Ie9bd95a0d8ce82385dfdc3435ddce5b129fcb98c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:20:07 +00:00
Arc Wang
0270951c5e
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2
am: 3d9bdda678
-s ours am: ec921eea1a
-s ours am: f0065e3adf
-s ours am: 09c382d878
-s ours am: c717665361
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Ic4b722086175803d1352855915ffb3d32eb1e55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:06:36 +00:00
Arc Wang
ac35d1fba1
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551
-s ours am: d47388ce79
-s ours am: 5f01cd3e3f
-s ours am: 7dd3084f1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219306
Change-Id: I85ce0fb7c6c80d140055a348a66373b2978116fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:06:29 +00:00
Arc Wang
56094f5a5e
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d
-s ours am: bb81ea5351
-s ours am: a13b99e496
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305
Change-Id: Ie8c4b1bff4f405371c46810afac011d2655d92a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:06:21 +00:00
Arc Wang
f6d30578b6
[automerger skipped] Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-mainline-prod am: 5adcf47c4f
-s ours
...
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 640eab60f2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Change-Id: Id338f4ffe6d94f2552281c47c5589739604c5fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:06:14 +00:00
TreeHugger Robot
7828afe859
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I29c94990fd4fd817084566ded10bb1bc851ebcec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:04:10 +00:00
Bill Yi
2819fde801
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18210269
Change-Id: I09548afe761010b4909cc3a2453d1980776d6b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:03:59 +00:00
Bonian Chen
c5fc5db0e7
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev
2022-06-23 04:08:21 +00:00
Bill Yi
07bfd0bbd9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7201ffacb47728950b9799b2c72db212dc290df7
2022-06-22 19:10:00 -07:00
Bill Yi
b070ddda17
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2d6dbb4522ef217b94075bb4999a5276f983095f
2022-06-22 19:05:21 -07:00
Salud Lemus
bb149294dd
Merge "Fix title used for financed device info in Settings" into tm-dev
2022-06-22 22:33:18 +00:00
Bonian Chen
29a00dbc31
Merge "[Settings] Adjusted the API of Settings app" into tm-dev
2022-06-22 18:59:54 +00:00
Oriol Prieto Gascó
d6166e42a0
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev
2022-06-22 17:18:45 +00:00
Bonian Chen
d10618d489
[Settings] Adjusted the API of Settings app
...
The API of Settings app get changed in order to support large screen.
This is a fix to adopt the change related to this work.
A short brief:
1. Accept ACTION_MAIN for launching MobileNetworkActivity.
2. Support deep-link intent while MobileNetworkActivity in foreground.
3. Avoid from binding MobileNetworkActivity as a single instance.
Bug: 230047450
Bug: 234406562
Bug: 229371407
Test: local & unittest
Change-Id: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
2022-06-22 07:51:47 +08: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
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
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
Salud Lemus
a1df448703
Fix title used for financed device info in Settings
...
The title for the financed device info page in Settings changes to
"Managed device info" instead of "Financed device info"
Bug: 236259020
Test: Manual test
Change-Id: Ica6d990e8dada28b643a5523ec284c18d4af89d2
2022-06-16 19:32:14 +00:00
SongFerngWang
5a4df243f0
Fix the NullPointException
...
The subscriptionInfo.getCarrierName may be a null, so adding the null
checking.
Bug: 236064286
Test: build pass
Change-Id: I8f6f5ac725d6dd552ac2626725e44f52dcbf6c32
2022-06-16 10:46:07 +08:00
Jason Parks
73276b3c91
Merge "Use API to check for the superivion component." into tm-dev
2022-06-15 12:54:00 +00:00
TreeHugger Robot
50a74572fc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-15 05:25:34 +00:00
Jason Parks
4a9c108b28
Use API to check for the superivion component.
...
Bug: 219025233
Test: manual
Change-Id: Icd2593a67ae0297340991a5375b18e2f933facb1
2022-06-14 17:16:07 +00:00
TreeHugger Robot
c45731efdb
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev
2022-06-14 03:01:18 +00:00
Jason Chiu
27c6b55ac5
Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link
...
If an app starts a Settings deep link with FLAG_ACTIVITY_NEW_DOCUMENT,
FLAG_ACIVITY_NEW_TASK is auto-appended by frameworks which causes a
SecurityException on the 2-pane design because starting a new task on
the right pane is not allowed.
Deep links in the 2-pane design will clear the top activities, which has
the same UX behavior of setting FLAG_ACTIVITY_NEW_DOCUMENT, so we remove
the flag in this case.
Fix: 233917580
Test: start account page via Assistant
Change-Id: Idcbeb96e441592d48686f18f3433864f2c14832a
2022-06-14 02:45:49 +00:00
Bill Yi
f68acfb73e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I18a9ac4db3be35e4b643a213c8635b1b22a2bec8
2022-06-13 16:26:38 -07:00
TreeHugger Robot
e058aae3cd
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev
2022-06-13 18:11:22 +00:00
TreeHugger Robot
e5a507e23c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I441cc35d147566377eb06f328905a44ea6649954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:05:07 +00:00
Bill Yi
04d01b2661
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I76566346fa6990130c77e736031ecbf4e40b2c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:04:55 +00:00
Bill Yi
362f3f6b6a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: Ib0ff724718fbe1ab699152f1a6744015645d7051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:04:36 +00:00
TreeHugger Robot
2614629a50
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-06-13 16:44:24 +00:00
TreeHugger Robot
8122edc9ac
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-13 16:40:03 +00:00
Bonian Chen
03da62810c
[Settings] Avoid from close dialog when touch outside.
...
Roaming confirmation dialog might get closed when touch outside,
which is easily been triggered when having a large screen.
Solution: avoid from close dialog when touch outside of dialog area.
Bug: 235183999
Test: local
Change-Id: Ic312d80e6f04cb8f323ebc713eef4e15257de358
2022-06-13 20:55:32 +08:00
Jason Chiu
ae1c17bd0f
Add "smallestScreenSize" into homepage activities
...
The Settings home activity was initially launched in full-screen size,
and then resized in order to be displayed with another placeholder
activity size-by-side.
After ag/18668447, the smallest screen width dp configuration of the
activity was changed to half of the screen size (vs. the fullscreen
size) while embedding.
Therefore, the system updates the configuration changes using
CONFIG_SMALLEST_SCREEN_SIZE, which the Settings home activities didn't
declared. This makes Settings show the full-screen home layout in
dual-pane mode.
Fix: 235449822
Test: visual, robotest
Change-Id: I801ff5fb20b2a42c94223a6edd4af08b67e7f4e9
2022-06-13 06:44:22 +00:00
Bill Yi
e006e9823d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I81a6f90e03513ab441888db3316d4b612b3a72ca
2022-06-11 13:17:41 -07:00
Bill Yi
5154fc5c35
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3654d12018957304a0bd3064d9950d284baaf332
2022-06-11 12:55:04 -07:00
Bill Yi
0157713d52
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8e4f48ee4f355af084d6a0edcb2d4172246a4a87
2022-06-11 12:49:13 -07:00
Bill Yi
154b913f4b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9332ed519d4fb2a15ad3ba9fcfea68d9ab657ff8
2022-06-10 21:47:08 -07:00
Bill Yi
f5cfec7f75
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e5a4af5147a8e1cdebd5049ad5941ce51442553
2022-06-10 21:43:26 -07:00
TreeHugger Robot
1c45e9ad72
Merge "Update fingerprint removal dialog strings" into tm-dev
2022-06-10 20:09:03 +00:00