Bill Yi
49c7a74c59
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours
...
am: 5188a0560f
2019-08-17 09:55:19 -07:00
Bill Yi
c94de34259
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours
...
am: 978cd2b768
2019-08-17 09:55:17 -07:00
Bill Yi
978cd2b768
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
2019-08-17 09:45:16 -07:00
Bill Yi
5188a0560f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
2019-08-17 09:45:15 -07:00
Bill Yi
735e8a680d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
2019-08-17 09:45:15 -07:00
TreeHugger Robot
7892f729a5
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-08-17 16:30:21 +00:00
Android Build Merger (Role)
22cbd5ca0d
Merge "Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d am: 2394d0821b" into qt-qpr1-dev-plus-aosp
2019-08-17 14:28:18 +00:00
Arc Wang
a266ec8ffd
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d
...
am: 0e53b6293d
2019-08-17 07:27:01 -07:00
Arc Wang
aece3458cf
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d
...
am: 2394d0821b
2019-08-17 07:26:55 -07:00
Arc Wang
0e53b6293d
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
2019-08-17 07:18:03 -07:00
Arc Wang
2394d0821b
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
2019-08-17 07:17:59 -07:00
Arc Wang
5101624819
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
2019-08-17 07:17:59 -07:00
TreeHugger Robot
54dbed859d
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
2019-08-17 13:58:53 +00:00
Bill Yi
0bb9d1e153
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
2019-08-17 01:35:46 -07:00
Kevin Chyn
058af41a42
Remove delay from enroll start button
...
Fixes: 139554930
Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
2019-08-17 04:52:30 +00:00
Kevin Chyn
f490c7cb7f
Merge "Update attention string" into qt-r1-dev am: e218dc0517
...
am: 5725d33471
2019-08-16 20:01:16 -07:00
Android Build Merger (Role)
0abf9968d7
Merge "Merge "Update attention string" into qt-r1-dev am: e218dc0517 am: 5725d33471" into qt-qpr1-dev-plus-aosp
2019-08-17 02:52:20 +00:00
Kevin Chyn
0967e12b69
Merge "Update attention string" into qt-r1-dev am: e218dc0517
...
am: ddd4fb660e
2019-08-16 19:51:51 -07:00
Kevin Chyn
60c939da52
Merge "Update attention string" into qt-r1-dev am: e218dc0517
...
am: 5725d33471
2019-08-16 19:51:51 -07:00
Kevin Chyn
208b633c7e
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
2019-08-16 19:51:18 -07:00
Kevin Chyn
ddd4fb660e
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
2019-08-16 19:43:00 -07:00
Kevin Chyn
5725d33471
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
2019-08-16 19:42:52 -07:00
Kevin Chyn
e218dc0517
Merge "Update attention string" into qt-r1-dev
2019-08-17 02:01:31 +00:00
Arc Wang
91200e610d
[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem
...
Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.
This fix check the setting of active subscription and shows the preference.
Bug: 138956509
Test: CellularFallbackPreferenceControllerTest
manual test:
1. Insert feature supported SIM and check UI.
2. Remove feature supported SIM and check UI.
3. Turn airplane mode on and check 1. and 2..
Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
2019-08-17 01:37:21 +00:00
Kevin Chyn
8e1d1ca3ab
Remove attention controller
...
Bug: 139484065
Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
2019-08-16 16:34:09 -07:00
Kevin Chyn
821fbc83a1
Update attention string
...
Bug: 139484065
Test: manual
Change-Id: Ie4619fb51709ba2651866b7841dd4d6b51f165d1
2019-08-16 16:34:09 -07:00
Xin Li
78d26fb0c9
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours am: b03fdd4dcf -s ours am: e66eb255ee
...
am: 0907055fcc
2019-08-15 01:12:05 -07:00
Xin Li
0907055fcc
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours am: b03fdd4dcf -s ours
...
am: e66eb255ee
2019-08-15 00:50:19 -07:00
Xin Li
e66eb255ee
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours
...
am: b03fdd4dcf
2019-08-15 00:40:41 -07:00
Xin Li
a3a692bd24
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: c3ef16882d -s ours am: f8c25b6ac4 -s ours am: f62f61cbfb
...
am: ea995aaaff
2019-08-15 00:36:07 -07:00
Xin Li
b03fdd4dcf
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
...
am: 1e53efc4c4
2019-08-15 00:25:54 -07:00
Xin Li
ea995aaaff
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: c3ef16882d -s ours am: f8c25b6ac4 -s ours
...
am: f62f61cbfb
2019-08-15 00:16:41 -07:00
Xin Li
f62f61cbfb
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: c3ef16882d -s ours
...
am: f8c25b6ac4
2019-08-14 23:52:30 -07:00
Xin Li
f8c25b6ac4
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
am: c3ef16882d
2019-08-14 23:32:21 -07:00
Treehugger Robot
1e53efc4c4
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
2019-08-15 06:13:48 +00:00
Xin Li
3cbc718e81
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 9821df1b1f -s ours am: 8cabf84832
...
am: 2f464241a1
2019-08-14 14:23:33 -07:00
Xin Li
2f464241a1
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 9821df1b1f -s ours
...
am: 8cabf84832
2019-08-14 13:56:58 -07:00
Xin Li
8cabf84832
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
am: 9821df1b1f
2019-08-14 13:32:06 -07:00
Xin Li
9821df1b1f
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
Bug: 134405016
Change-Id: I80e9ac9e5e6a21ebd94543865b8f75c20020360d
2019-08-14 11:35:21 -07:00
Jordan Liu
eda0936e38
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0 am: b377a593b7 am: 1fc63fc444
...
am: 028f2c87a1
2019-08-13 19:13:45 -07:00
Jordan Liu
028f2c87a1
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0 am: b377a593b7
...
am: 1fc63fc444
2019-08-13 19:01:30 -07:00
Jordan Liu
1fc63fc444
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0
...
am: b377a593b7
2019-08-13 18:48:49 -07:00
Jordan Liu
b377a593b7
Merge "Allow radio info on phones with no subscription"
...
am: 19d1f890a0
2019-08-13 18:37:15 -07:00
Jordan Liu
19d1f890a0
Merge "Allow radio info on phones with no subscription"
2019-08-14 00:22:42 +00:00
Xin Li
c3ef16882d
DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
Bug: 139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520
2019-08-13 16:36:39 -07:00
android-build-team Robot
573db8a758
Snap for 5674421 from 4a949c0640 to pi-platform-release
...
Change-Id: Idb0d7d08f9581908c2f5e2881a73b1c806f1ddb9
2019-08-13 16:25:08 +00:00
Yi Jiang
e6af4e136b
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
...
am: 7933af0273
2019-08-12 18:51:42 -07:00
Yi Jiang
943e7b34e8
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
...
am: 7933af0273
2019-08-12 18:41:16 -07:00
Yi Jiang
7933af0273
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
2019-08-13 01:28:31 +00:00
Jordan Liu
655c1be579
Allow radio info on phones with no subscription
...
Some info is still helpful for debugging in these cases.
Bug: 139074613
Test: manual
Change-Id: Idbde691c60b53e0ab755df229a3a9dc77406934d
Merged-In: Idbde691c60b53e0ab755df229a3a9dc77406934d
2019-08-12 19:02:27 +00:00
