Commit Graph

53151 Commits

Author SHA1 Message Date
Lei Yu
22a9f539e9 Use NetworkTemplate to query data
So virtual carrier can get correct data with merged subscriberIds

Bug: 120566366
Test: RunSettingsLibRoboTests
Change-Id: I02abed77dffb55ef49fe0c4142f6f5b4a42ebe52
2019-05-13 13:04:46 -07:00
lindatseng
943d649f73 Fix crash on panel rotation
Should force PanelFragment creation on rotation change.

Change-Id: If2ccae7dbc4278103c95621743570b37113746f7
Fix: 132587339
Test: Manual
2019-05-13 19:48:59 +00:00
Jason Chiu
4af092ac88 Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev am: 6a3eb31763
am: 90cb5628bb

Change-Id: I80d9d96d1be2fa871d1320e29f3c3cb380676d42
2019-05-13 12:34:36 -07:00
Jason Chiu
90cb5628bb Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev
am: 6a3eb31763

Change-Id: I40edb775bb09083110767745728356aa7c639d47
2019-05-13 12:05:11 -07:00
Mady Mellor
47aad1c655 Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev am: 240b227e1f
am: 34fa757cc9

Change-Id: I01aa071f1ce7f59aa160b7e53baf9da2d2a7db95
2019-05-13 11:59:52 -07:00
TreeHugger Robot
6a3eb31763 Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev 2019-05-13 18:58:44 +00:00
Mady Mellor
34fa757cc9 Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev
am: 240b227e1f

Change-Id: I899722a6df929c4093a5a74447eb25a610c80308
2019-05-13 11:38:26 -07:00
Mady Mellor
240b227e1f Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev 2019-05-13 18:18:31 +00:00
Zhi An Ng
bb3f187569 Merge "Update string description in SAW unsupported screen" into qt-dev am: 516bdc20fb
am: 3a6d75d7fa

Change-Id: I13f6932f81b0bbd8f203305667eed37c6312bb72
2019-05-13 10:17:39 -07:00
Zhi An Ng
3a6d75d7fa Merge "Update string description in SAW unsupported screen" into qt-dev
am: 516bdc20fb

Change-Id: Ie6513a8cb03fa8789ad5d70d9a6d6c14dcb4cf67
2019-05-13 10:13:32 -07:00
Fan Zhang
c2a85a374d Make subsettings display edge-to-edge
Fixes: 132182711
Test: visual
Change-Id: I3b0635cba359f74d463c2360323d80c5c9533228
2019-05-13 10:07:13 -07:00
andychou
9ac6d81177 Fix IMEI information can't display without pSIM inserted
When no SIM, we can't get active subscription info.
So current code will not create TelephonyManager and cause IMEI not
retrieved.
Create TelephonyManager with default if no subscription info.

Bug: 132215720
Test: test with SIM and without SIM to check SIM status UI and atest ImeiInfoDialogControllerTest pass
Change-Id: Iaeb932ea66a6bee77136251941cca657984e456f
2019-05-14 00:55:47 +08:00
Zhi An Ng
516bdc20fb Merge "Update string description in SAW unsupported screen" into qt-dev 2019-05-13 16:52:22 +00:00
TreeHugger Robot
9a0a868e05 Merge "Fix robolectric test error" 2019-05-13 10:21:20 +00:00
Raff Tsai
3c337d5659 Fix robolectric test error
Fixes: 132575837
Test: make RunSettingsRoboTests
Change-Id: I5238a3789f5308a489298fadae772b8b9343ddb5
2019-05-13 16:56:05 +08:00
Arc Wang
472a9da81d Merge "Fix Wi-Fi QR code scanner height at 360dp" into qt-dev am: 26ff84d3f4
am: bdd68115dd

Change-Id: I5d89bac92fe0ddba7184b589236dfcfb59b9b6f9
2019-05-13 00:35:59 -07:00
Arc Wang
bdd68115dd Merge "Fix Wi-Fi QR code scanner height at 360dp" into qt-dev
am: 26ff84d3f4

Change-Id: Ia21d3201d854c44f1372616981df855cf2ba5781
2019-05-13 00:25:49 -07:00
TreeHugger Robot
26ff84d3f4 Merge "Fix Wi-Fi QR code scanner height at 360dp" into qt-dev 2019-05-13 07:10:11 +00:00
Tim Peng
82adb00c8c Hide audio switcher entry-point in the volume slice when in call am: c007158819
am: a60471e1e5

Change-Id: I29dc0c5d3f5ed9f5f37eedda06bdaf59575d074b
2019-05-12 19:22:41 -07:00
Tim Peng
a60471e1e5 Hide audio switcher entry-point in the volume slice when in call
am: c007158819

Change-Id: I76265d9eccf5174df500c4c1518af6d3c1fc2cad
2019-05-12 19:09:24 -07:00
Tim Peng
c007158819 Hide audio switcher entry-point in the volume slice when in call
- update test case

Bug: 132385707
Test: make -j42 RunSettingsRoboTests
Change-Id: Ibfd12e75f584b6884d1025018772ac9c19673156
2019-05-13 01:38:39 +00:00
Bill Yi
4d19fd6627 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0abec2cc56 -s ours
am: 30715db85a -s ours
am skip reason: subject contains skip directive

Change-Id: If8eae2e1c11280227facfb7d19ed01c5bfaf0dc6
2019-05-12 09:55:39 -07:00
TreeHugger Robot
ca68620de7 Merge "Import translations. DO NOT MERGE" 2019-05-12 16:51:20 +00:00
Bill Yi
30715db85a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0abec2cc56 -s ours
am skip reason: subject contains skip directive

Change-Id: I82105c48c3cecc5c985a4d7b3049226b77180763
2019-05-12 09:50:39 -07:00
TreeHugger Robot
0abec2cc56 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-05-12 16:41:32 +00:00
Bill Yi
8ca57ab57a Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If3dd5a2b6dfd25ecbd48c4870499f9ed5228a014
2019-05-12 06:01:13 -07:00
Bill Yi
d37d31e609 Import translations. DO NOT MERGE
Change-Id: I8309d59c81e95a74a286424e2b99ddf407bc428e
Auto-generated-cl: translation import
2019-05-12 05:26:59 -07:00
Hai Shalom
c48a02ed8f Merge "[WPA3] Fix connectivity issues with PSK-SAE Transtion mode" into qt-dev am: b2fcb7825e
am: 44926a0160

Change-Id: I06df5837db7b69712a98447742dc08f4d02532b2
2019-05-11 20:14:02 -07:00
Hai Shalom
44926a0160 Merge "[WPA3] Fix connectivity issues with PSK-SAE Transtion mode" into qt-dev
am: b2fcb7825e

Change-Id: If02ef643c1903f447231215aaacd807e3f345311
2019-05-11 20:00:37 -07:00
TreeHugger Robot
b2fcb7825e Merge "[WPA3] Fix connectivity issues with PSK-SAE Transtion mode" into qt-dev 2019-05-12 02:43:06 +00:00
Kevin Chyn
48b9e8a54b Merge "Propagate intent extras and finish activity properly" into qt-dev am: 7ac16f152e
am: f4099a8f84

Change-Id: Icbc862e1333dec72fab454b51e5d8ea4f5a16a12
2019-05-11 03:42:20 -07:00
Raff Tsai
f33c047cbd Merge "Log ACTION_CONTEXTUAL_CARD_SHOW in different place" into qt-dev am: 42aac32823
am: b202df4422

Change-Id: I83a4fcefd33d9b9126a75deab92af74ae9f68d4b
2019-05-11 03:41:24 -07:00
joshmccloskey
b4627760d1 Merge "Fixed spacing on Intro & Edu screens" into qt-dev am: 806c65ca17
am: 87dbedb514

Change-Id: I5889c86ecdc1424b2c5def6dc531bbc372021db6
2019-05-11 03:38:57 -07:00
Fan Zhang
8ee52ff9c5 Clean up before making all setting page render edge-to-edge am: 9db66a562c
am: 0a29fb054e

Change-Id: I0783eb3b832d079ecc0b5742a606809f2448415f
2019-05-11 03:34:53 -07:00
Mill Chen
f78ccde6bd Merge "Update listDivider for PreferenceFragmentCompat" into qt-dev am: dcf21d4bd6
am: 7aa0ab732b

Change-Id: I0ea76a0ef06204af88e04722e9f7f5317b861971
2019-05-11 03:25:57 -07:00
Fan Zhang
8a2ae8cdf0 Merge "Updating animation asset" into qt-dev am: 5dd9850bf3
am: b104df9efc

Change-Id: I44f679bff8e09199490c7170c7f9571514b128f2
2019-05-11 02:52:21 -07:00
Brad Ebinger
c1cb825acb Merge "Resolve the SIM call manager per subId" into qt-dev am: 1350309ecc
am: 96af57b47f

Change-Id: I482abff107e8719bf88b5dd3ac92a9b735e0c003
2019-05-10 22:41:59 -07:00
Brad Ebinger
397fe0806e Merge "Allow SimDialogActivity to be started for result" into qt-dev am: d204d6c33f
am: 9761dd4634

Change-Id: I5dc3f6b791e258be13d073640be77f89de460570
2019-05-10 22:20:42 -07:00
Kevin Chyn
f4099a8f84 Merge "Propagate intent extras and finish activity properly" into qt-dev
am: 7ac16f152e

Change-Id: I5bc447218d41fc098ea489c5fb8defdf5381f88d
2019-05-10 21:49:42 -07:00
Kevin Chyn
7ac16f152e Merge "Propagate intent extras and finish activity properly" into qt-dev 2019-05-11 04:31:14 +00:00
Jason Chiu
2c3e6c6434 Fix automatically directing the user to the captive portal in Wi-Fi Slice
The feature failed after the CL "Force the adapter to rebind cards with
a toggle".

Because toggle slices have been forced to rebind after starting another
activity and when any slice is updating. This unpins Wi-Fi slice and
stops WifiScanWorker and then clears the saved clicked network.

Solution:
1. Change ConnectToWifiHandler from activity to receiver and send
   broadcasts to it with FLAG_RECEIVER_FOREGROUND, so Wi-Fi slice won't
   be forced to rebind.
2. Seperate Wi-Fi scan worker and contextual Wi-Fi scan worker. Keep the
   original logic for the generic one, and then add the logic below to
   the contextual one.
3. Do not clear the saved clicked network when slice is unppined because
   it happens frequently in contextual homepage.
4. Introduce a static long in ContextualWifiScanWorker that updates once
   in every visible UI session. A session is when the screen is visible
   to user.
5. Use session token to determine whether auto-starting captive portal
   is needed.

Fixes: 128056349
Test: robotest, visual in homepage and network panel
Change-Id: I9e03c379806e124fa7253b2a635574b2433f6afc
2019-05-11 03:26:57 +00:00
hughchen
1042c287ac Merge "Clear media switcher items when in phone call" into qt-dev am: 12dcbe7c71
am: 26aa660541

Change-Id: Id7ade81d98528bb6c16fee243d148d359101712d
2019-05-10 20:22:01 -07:00
Raff Tsai
b202df4422 Merge "Log ACTION_CONTEXTUAL_CARD_SHOW in different place" into qt-dev
am: 42aac32823

Change-Id: I82dc550b23c6fc11fff350c7c72f0154985a62f6
2019-05-10 19:50:15 -07:00
joshmccloskey
87dbedb514 Merge "Fixed spacing on Intro & Edu screens" into qt-dev
am: 806c65ca17

Change-Id: Iaa76703169d28f8ab6cfa1e8eee2b9c6efeadfb7
2019-05-10 19:46:59 -07:00
TreeHugger Robot
42aac32823 Merge "Log ACTION_CONTEXTUAL_CARD_SHOW in different place" into qt-dev 2019-05-11 02:27:24 +00:00
Kevin Chyn
acb113b06a Propagate intent extras and finish activity properly
Bug: 131861430

Test: Builds
Change-Id: I7e831f74f1e55026b9343a4c4f47c9f5adc316e6
2019-05-10 18:58:13 -07:00
TreeHugger Robot
806c65ca17 Merge "Fixed spacing on Intro & Edu screens" into qt-dev 2019-05-11 01:40:56 +00:00
joshmccloskey
2e70232caf Re-enable continue button for accessibility flow
Test: Removed userdata, went to education flow, enabled accessibility
and confirmed the next button was re-enabled
Fixes: 132463368

Change-Id: I7cd78d606fa4c191b44199a0d143b56b33be4fa4
2019-05-10 17:59:25 -07:00
Fan Zhang
0a29fb054e Clean up before making all setting page render edge-to-edge
am: 9db66a562c

Change-Id: I70c7fa7dc398e1d95d44453e9b3a3a7812b0205d
2019-05-10 17:28:08 -07:00
Raff Tsai
3d2655c100 Log ACTION_CONTEXTUAL_CARD_SHOW in different place
Fixes: 132396134
Test: robolectric
Change-Id: I7d46df15fbc42838da0fa53f4db7e1aa026c3174
2019-05-11 08:28:08 +08:00