Bill Yi
bef504f4d9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2
-s ours am: 2819fde801
-s ours am: b0c3d40284
-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: I27af7bfcf9268f6bcc705f8d95f43676c68e1fa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:48:20 +00:00
TreeHugger Robot
cda272683c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee
-s ours am: 7828afe859
-s ours am: 2fae3c8608
-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: Icdab34d01bad748d63732b5a70c1f21a973aaca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:48:04 +00:00
Bill Yi
6678d1b395
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2
-s ours am: 2819fde801
-s ours am: d36fa64c17
-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: I27baae14faa720d8fa2fc9f69d2900475aa6197d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:47:59 +00:00
TreeHugger Robot
2fae3c8608
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 94061be6ee
-s ours am: 7828afe859
-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: If55c036e66029f9f40366cb6fe05cf4f763be054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:30:19 +00:00
Bill Yi
d36fa64c17
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2
-s ours am: 2819fde801
-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: Idfb9cf3bc7e1208b7ad8ba011095695025e23555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:30:14 +00:00
Bill Yi
b0c3d40284
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c60e7098d2
-s ours am: 2819fde801
-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: Ifd346dd88f15a3fda7689b0c7d1f34563d861b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-24 00:28:47 +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
TreeHugger Robot
83da805299
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 49a681bb37
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: Icf109cb516d4707651889218440e6505c1c7a2a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:45:34 +00:00
Bill Yi
d7343cd35b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 382bed292d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19009446
Change-Id: I3208b65b9ae16f865ea4f77029a8d0bd741ec55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:45:28 +00:00
TreeHugger Robot
4f950cb0f2
[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: I4aceec2f0ed1e39fd5974f9085f71f47b6244d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:45:17 +00:00
Bill Yi
968957026f
[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: I64789bcb06aecccdbfe6a9feb0bbfd2e2e1833f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-23 11:45:10 +00:00
TreeHugger Robot
49a681bb37
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-06-23 11:24:26 +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
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
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
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
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
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ó
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ó
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
81ffe66488
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a
-s ours am: c00d5a7f5d
-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: If979eaa0cd9e5d825fe6f52c4799c3a5339eb010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:48:33 +00:00
Bill Yi
1c73653383
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898
-s ours am: d753deda12
-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: Ie15e8dfadc34ebdee28720e5e5c18c376d2d4fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:48:27 +00:00
Bill Yi
bec60237b0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891
-s ours am: 3f823f660a
-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: Ib85eb4c0123850334bb87382fd79c012fbe90cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:48:20 +00:00
TreeHugger Robot
9ea3a54355
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a
-s ours am: 16a6989a3e
-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: I40c50c61a9e4ce33eb867899a4889dda6ed2fe04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:40:00 +00:00
Bill Yi
3a2fbdc7da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898
-s ours am: 8c356181d3
-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: I602d25b39aaf22343d1e83a6c15a828ce742bf6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:39:53 +00:00
Bill Yi
414f01583d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891
-s ours am: ba3e9a0be7
-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: I196d973fb387245a7a1457027559e299385502db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:39:47 +00:00
TreeHugger Robot
c00d5a7f5d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a
-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: Ib3dea3a493038f22ed97886bd0c25b6373777056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:39:20 +00:00
Bill Yi
d753deda12
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898
-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: Ie5f49d9c904c50b3b92e3892107b3617986ccb9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:39:15 +00:00
Bill Yi
3f823f660a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891
-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: I9c75de2e6515a2d7fe252960d660b1d1bc03c860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:39:06 +00:00
TreeHugger Robot
16a6989a3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d9fba9380a
-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: Id68dad65a41f070989c3af1eb9a771ac36694d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:23:39 +00:00
Bill Yi
8c356181d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fabd8de898
-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: I7bc9900be8bff52607e50c04e5101bf155722e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:23:33 +00:00
Bill Yi
ba3e9a0be7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b92a98891
-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: Ib124601d7cf447559e33a4e6b863c0d6ad33aff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-21 16:23:24 +00:00
TreeHugger Robot
d9fba9380a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-21 16:17:20 +00:00