TreeHugger Robot
096942d9ab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a
-s ours am: d360cd6895
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: Idd7b333ecc505d491261e0916e994b9ec759cd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 12:08:58 +00:00
Bill Yi
28b04115ee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac
-s ours am: f1ccac59de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: I6821a13cff8548a35afa61b86eb9fe328c50dc91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 12:08:49 +00:00
TreeHugger Robot
d360cd6895
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: f08bf7780a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: Iee8fd197446401293b649fb866fca45375b14892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:46:03 +00:00
Bill Yi
f1ccac59de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2714015bac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009125
Change-Id: I07e7a8739655acb12d360200de06e1579aa3355e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:45:57 +00:00
TreeHugger Robot
f08bf7780a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-23 11:24:26 +00:00
Bonian Chen
b27361686a
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
am: 31b8174c10
am: 2cb39cf969
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: Iaf9d3e3d082f576fb58d54de59154cc79ac6a917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 05:08:24 +00:00
Bonian Chen
91c1a023e3
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
am: 31b8174c10
am: fef8aab672
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: Ieab524093fcf79f22ea57b6fd1989eb6b5351f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 05:01:18 +00:00
Bonian Chen
0805e9efbf
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
am: b88828b155
am: 4e2c3689e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: I321210e16c994d86824d952d04e7bb9a98e462d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 05:00:56 +00:00
Bonian Chen
fef8aab672
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
am: 31b8174c10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: I7526d262d7abb17eaae0a7ea597d8ca56a34953f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 04:52:13 +00:00
Bonian Chen
2cb39cf969
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
am: 31b8174c10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: Id817b88d0210b620c398b2598a954ec544548833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 04:52:11 +00:00
Bonian Chen
4e2c3689e3
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
am: b88828b155
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: Ib3003b99cc802e9ade9e0602de83fbc685ece742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 04:43:51 +00:00
Bonian Chen
31b8174c10
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: I7484149765a66e9c9beeeac1bb9dd596670a6ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 04:27:06 +00:00
Bonian Chen
b88828b155
Merge "[Settings] Avoid from close dialog when touch outside." into tm-dev am: c5fc5db0e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869528
Change-Id: I5bd96bac8e7313ec76a461a0d4e453da90ba9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 04:25:38 +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
Automerger Merge Worker
899697ea05
Merge "Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
am: 071719856d" into tm-d1-dev-plus-aosp am: 0ab3bc967d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542
Change-Id: I2f2d0a5514a42a6f2074d9c77106c72a4ab63e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 23:23:38 +00:00
Salud Lemus
a060b7ab4f
Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
am: 7e3c6913d3
am: 26bdfebe0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542
Change-Id: I0973a4d1f6e74b788392db96c5c95d88e79bb23e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 23:23:28 +00:00
Salud Lemus
416595f2dc
Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
am: 7e3c6913d3
am: fd1d882d8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542
Change-Id: Ic2101cf866cd697b2dfc3fbb15d9d8ffaf7b4c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 23:22:54 +00:00
Salud Lemus
fd1d882d8d
Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
am: 7e3c6913d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542
Change-Id: I926409fc54b474b2e8a079767d9eb0dc58056fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 23:08:03 +00:00
Automerger Merge Worker
0ab3bc967d
Merge "Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
am: 071719856d" into tm-d1-dev-plus-aosp
2022-06-22 23:08:01 +00:00
Salud Lemus
26bdfebe0b
Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
am: 7e3c6913d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542
Change-Id: I744f612059441079a6e5604de624536e3361e087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 23:07:58 +00:00
Salud Lemus
77c8fc99fb
Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
am: 071719856d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542
Change-Id: I9580fef4e972960b820154fabe8351028d549825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 23:07:57 +00:00
Salud Lemus
7e3c6913d3
Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542
Change-Id: I6237d72f20faa1961a5e7005244c8f0962bf891f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 22:49:19 +00:00
Salud Lemus
071719856d
Merge "Fix title used for financed device info in Settings" into tm-dev am: bb149294dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18934542
Change-Id: I48ec660d0ac6aecd3a28368a3b2035dbfb6fe297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 22:47:52 +00: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
Automerger Merge Worker
d0167dc315
Merge "Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e941740b35" into tm-d1-dev-plus-aosp am: 0366a838e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I96326d86cb4f19ef34ceb016b83ced02e2416ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:59:44 +00:00
Bonian Chen
16e47a83d1
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e9cdc176a6
am: a40112328c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: If1e5a7d0dbef973e634d214e99708b7797131feb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:59:34 +00:00
Bonian Chen
c1bd6bc6e3
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e941740b35
am: 67556fac04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I3aa2ebcdd16ff73296fbda1ce44441ba43bb4f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:59:10 +00:00
Automerger Merge Worker
0366a838e7
Merge "Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e941740b35" into tm-d1-dev-plus-aosp
2022-06-22 19:43:48 +00:00
Bonian Chen
fd99fa9354
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e941740b35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: Ie72ff5a356830d2f5f60b306e39ffef6d29d0c18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:43:41 +00:00
Bonian Chen
a40112328c
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e9cdc176a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I80200d5694abf84b7f540db8142b5f0f525cde49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:43:40 +00:00
Bonian Chen
67556fac04
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e941740b35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I8564a7c35b201d4a5022d9dcf2545a097822c4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:43:37 +00:00
Bonian Chen
e941740b35
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I8c39ef8a089394c52b5a80ea98fa77f2ab0f2ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:25:48 +00:00
Bonian Chen
e9cdc176a6
Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040
Change-Id: I8391c6e89654e3595a496de6da4485f27834bfda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 19:24:20 +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ó
35b80d9a8c
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
am: 0dfc94f668
am: 9302caf862
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: Id26b9533bab3586cc1ddc779e61450bbe0428314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:41:16 +00:00
Oriol Prieto Gascó
a3714708a4
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
am: 10e5657a39
am: 50911db0c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: Ib373f97ac26a2a3388748574bfa58ea40cb18e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:39:39 +00:00
Oriol Prieto Gascó
7e7df0d9b5
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
am: 0dfc94f668
am: 95d32d678c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: Idae7664b658f8057b30b9bcc50379d0cb11845fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:38:06 +00:00
Oriol Prieto Gascó
9302caf862
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
am: 0dfc94f668
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: Iad8417e638ea030a77e8c011c3c37074e4587597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:12:32 +00:00
Oriol Prieto Gascó
95d32d678c
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
am: 0dfc94f668
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: I94c1735bc1da2157654340fb809b0e7f273a804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:12:29 +00:00
Oriol Prieto Gascó
50911db0c3
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
am: 10e5657a39
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: Ia608719d3aa47159c80dd303bcc11360c000ee0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 18:02:01 +00:00
Oriol Prieto Gascó
0dfc94f668
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: I0af1ada1c42fe907243bcde356f51d8302bfb5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 17:45:17 +00:00
Oriol Prieto Gascó
10e5657a39
Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799
Change-Id: I7fcfd55573d121122867893a5624c297a1f18653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-22 17:43:23 +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
c141388b7a
Merge "Restrict ProviderModelSlice for guest user" into tm-qpr-dev am: ea9b715e78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18911434
Change-Id: I21514aba3524eeff34fccf3e31953f184f36fbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 17:06:53 +00:00
TreeHugger Robot
3997ccc2ee
Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev am: 2d0e1dc725
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910990
Change-Id: Iac11c8a9834528d81cb757a85a5bcaed7c8b8035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 17:06:42 +00:00
TreeHugger Robot
43b2ddba8a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a
-s ours am: 16a6989a3e
-s ours am: 16dfffd6e3
-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: Ia1289f99c7886f5734816309fe468dc87fc1dda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 17:05:48 +00:00
Bill Yi
9d91f503e9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898
-s ours am: 8c356181d3
-s ours am: bbce161bdf
-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: I8da65621500e49aefddac4acb71ba6ef83d36284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 17:05:40 +00:00
Bill Yi
89ee789df2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891
-s ours am: ba3e9a0be7
-s ours am: 22f8ed5745
-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: I10214c9c17a5ef9d5ba3cdf4a18b52f9ea434d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 17:05:32 +00:00
TreeHugger Robot
ea9b715e78
Merge "Restrict ProviderModelSlice for guest user" into tm-qpr-dev
2022-06-21 17:05:16 +00:00