Antony Sargent
0f1b14e467
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes
...
am: aa88b8cee66d910e8608
2019-10-14 00:33:09 -07:00
Antony Sargent
aa88b8cee6
Make EnabledNetworkModePreferenceController listen to setting changes
...
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.
Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Merged-In: I5dfe4843a681c613f49caf4584e9dbebc54e708a
2019-10-14 04:59:03 +00:00
Paul Hu
3a728ae13b
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
...
am: a67ca4cfd7
2019-10-01 03:03:36 -07:00
Paul Hu
a67ca4cfd7
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
2019-10-01 09:50:28 +00:00
Taesu Lee
9e81a2f4a8
Merge "Fix to show eUICC preference in eng build"
...
am: e825c30137
2019-09-25 23:14:10 -07:00
Treehugger Robot
e825c30137
Merge "Fix to show eUICC preference in eng build"
2019-09-26 05:53:10 +00:00
Bill Yi
500e7b2b71
Import translations. DO NOT MERGE
...
Change-Id: I0f9786915ebc5c168487e7a5386d4f2060d27a12
Auto-generated-cl: translation import
2019-09-24 18:54:26 -07:00
Daniel Huang
f28625bcf1
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
...
am: 51cb777530
2019-09-24 02:32:29 -07:00
Daniel Huang
51cb777530
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
2019-09-24 09:21:51 +00:00
Yi-Ling Chuang
8d8c3e19b5
Merge "Enable dismissal feature on legacy suggestions."
...
am: ee39335edc
2019-09-22 20:03:21 -07:00
Treehugger Robot
ee39335edc
Merge "Enable dismissal feature on legacy suggestions."
2019-09-23 02:45:25 +00:00
Yi-Ling Chuang
83ac0efd81
Enable dismissal feature on legacy suggestions.
...
Add back the close button for legacy suggestions.
Fixes: 140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced
2019-09-20 18:03:10 -07:00
苗苗 (Miao Miao)
9f4a65c893
In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's
...
STEPS TO REPRODUCE:
1. Insert two sim into device, sim1 is CUCC, sim2 is CMCC
2. Goto Settings-Network & Internet-sim1-MobileNetworkSettings-Access Point Names. It shows CUCC APN information
3. Hot plug out sim2
4. Hot plug in sim2, APN information changes to CMCC APN information
EXPECTED RESULTS:
When hot plug out/in sim2, sim1 APN settings interface should still keep its APN information instead of changing to sim2 APN information
Change-Id: I04c769f60ba1686b2c9bebcd07e3a04685979442
Bug: 141087659
Test:In sim1 APN settings interface, hot plug out/in sim2, it shows sim1 APN information all the time, test pass.
2019-09-20 18:13:30 +08:00
Neil Fuller
b83ddefb5c
Merge "Remove use of deprecated Time class"
...
am: b3f8696c4d
2019-09-17 09:56:45 -07:00
Treehugger Robot
b3f8696c4d
Merge "Remove use of deprecated Time class"
2019-09-17 16:32:47 +00:00
Neil Fuller
4c77d00e34
Remove use of deprecated Time class
...
Remove a use of the deprecated Time class.
Bug: 16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
2019-09-17 13:53:17 +01:00
paulhu
52d24750a4
[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED
...
Settings is using CONNECTIVITY_INTERNAL to restrict launching
tether provisoning activity by provioning apps only. However,
CONNECTIVITY_INTERNAL will be deprecated from Android R, replace
the permission to TETHER_PRIVILEGED.
Bug: 32963470
Test: atest TetherServiceTest
Change-Id: I4c8312b92de8d5d9c9090c572e54622dc4fcf9d4
2019-09-12 17:21:43 +08:00
Xin Li
aac7f8e2cd
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
Bug: 135460123
Change-Id: Ifbb4b45d2d592e4a4ede265d2c882dc1cb4a0410
Merged-In: Idcc078c0e541c04633db6d94c613ac4c861ba963
2019-09-08 13:06:57 -07:00
Taesu Lee
39e4fbb746
Fix to show eUICC preference in eng build
...
DEVELOPMENT_SETTINGS_ENABLED is not set before entering Developer
options in settings app even if it is in eng build. To show eUICC
preference in eng build, uses isDevelopmentSettingsEnabled() instead.
Test: Manual and make RunSettingsRoboTests
Change-Id: Ia1f46fad94bc62ca48dcfef7cd5d6188766aa380
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2019-09-06 16:11:39 +09:00
Xin Li
d7a8e234e9
Merge "DO NOT MERGE - Merge Android 10 into master"
2019-09-05 16:53:18 +00:00
Xin Li
7195e05dfa
DO NOT MERGE - Merge Android 10 into master
...
Bug: 139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963
2019-09-04 13:34:43 -07:00
Xin Li
bd8030e8b2
DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
...
Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
2019-08-23 06:45:17 +00:00
Xin Li
f92905cfe9
DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
...
Bug: 139893257
Change-Id: Iff267db7ff7312a786dc5004a7421b395da178a9
2019-08-23 06:42:10 +00:00
Bill Yi
d9c4bdf4fb
[automerger skipped] Import translations. DO NOT MERGE
...
am: ba8880dd87
2019-08-20 13:36:38 -07:00
Bill Yi
ba8880dd87
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 139484065
Change-Id: I6c50b4480bec5326951eb809eabc7194d1d06b65
2019-08-20 18:39:09 +00:00
Kevin Chyn
645480a4e4
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
2019-08-19 19:57:37 -07:00
TreeHugger Robot
41aafab963
Merge "Remove attention controller" into qt-r1-dev
2019-08-20 02:37:20 +00:00
Kevin Chyn
d1e331dbcd
Merge "Remove delay from enroll start button" into qt-r1-dev
...
am: ca2bbdfeca
2019-08-19 15:09:00 -07:00
Kevin Chyn
ca2bbdfeca
Merge "Remove delay from enroll start button" into qt-r1-dev
2019-08-19 21:50:22 +00: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
TreeHugger Robot
7892f729a5
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-08-17 16:30:21 +00: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
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
ddd4fb660e
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
2019-08-16 19:43:00 -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
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
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
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
