Commit Graph

51830 Commits

Author SHA1 Message Date
Jason Chiu
1364d53d47 Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev
am: 6a3eb31763

Change-Id: I666980a0496f0d72d4fb251a6b8b16a1599fafac
2019-05-13 12:05:10 -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
474179dfd0 Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev
am: 240b227e1f

Change-Id: Ie9da51b2bff4766ff896f83e251b86afe339ff0e
2019-05-13 11:38:45 -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
da27e8ac7d Merge "Update string description in SAW unsupported screen" into qt-dev
am: 516bdc20fb

Change-Id: Ie24eb4df4a6c0622037db7caa911a099fdfc6548
2019-05-13 10:13:30 -07:00
Zhi An Ng
516bdc20fb Merge "Update string description in SAW unsupported screen" into qt-dev 2019-05-13 16:52:22 +00:00
Arc Wang
835623dfe1 Merge "Fix Wi-Fi QR code scanner height at 360dp" into qt-dev
am: 26ff84d3f4

Change-Id: Ib972b5ae0a5e2c18f91b92c01615f53883675669
2019-05-13 00:25:52 -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
737e5fa3b2 Hide audio switcher entry-point in the volume slice when in call
am: c007158819

Change-Id: I480f4fc32232f09628fe7a22c0428553d9835cf9
2019-05-12 19:09:58 -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
cd0d3bf268 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0abec2cc56 -s ours
am skip reason: subject contains skip directive

Change-Id: I16479f9495ff664c55950ae2b383fb226b00be27
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
Hai Shalom
a070ea6eff Merge "[WPA3] Fix connectivity issues with PSK-SAE Transtion mode" into qt-dev
am: b2fcb7825e

Change-Id: I79d4ce16bf6cc8baca635eec120347337bc8a65c
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
ee8bb491b3 Merge "Propagate intent extras and finish activity properly" into qt-dev
am: 7ac16f152e

Change-Id: I064d00a4d2685f1173d239b4c631f7071c10fa3b
2019-05-10 22:01:14 -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
Raff Tsai
e2a229b07a Merge "Log ACTION_CONTEXTUAL_CARD_SHOW in different place" into qt-dev
am: 42aac32823

Change-Id: I6fe470fd7e2df04bd9f2bb1924b8fb8c0c46923a
2019-05-10 19:42:49 -07:00
joshmccloskey
38f933a90c Merge "Fixed spacing on Intro & Edu screens" into qt-dev
am: 806c65ca17

Change-Id: I4772423ee1a7ec326e8b36ab84f7f528c097e7a5
2019-05-10 19:31:43 -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
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
Fan Zhang
21e76e1929 Clean up before making all setting page render edge-to-edge
am: 9db66a562c

Change-Id: I7f1a9383e09d41365fa0286368367f36ceabdd5f
2019-05-10 17:25:15 -07:00
joshmccloskey
fe6784b57d Fixed spacing on Intro & Edu screens
Test: It builds.
Fixes: 132370812
Change-Id: I7bfa8a7eae91ad9b0fc9b19c9a6bc019f884e729
2019-05-11 00:11:02 +00:00
Mady Mellor
32fa736dd6 Move feature-level Bubble setting into developer options; default to off
Functionality:
* Moves feature-level setting into developer settings (apps section)
* Adds bubbles in developer options under "apps" section
* Configures the app-specific bubble toggle in notifications settings
  to be hidden / shown based on the developer setting
* Configures the channel-specific bubble toggle in notification channel
  settings to be hidden / shown based on the developer setting

Tests:
* Anything that might be assuming that it's globally enabled now has
  a bit to enable it globally in that test
* There is a logic change now where the app-level setting would be available
  even if off globally, now that is not true -- if it's off globally the
  app-level is no longer available
* Adds tests for the developer setting

Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Bug: 131845765
Change-Id: I5f6bf74e5ada3fc023571825cca10d7bddc60e6e
2019-05-10 15:41:06 -07:00
Fan Zhang
9db66a562c Clean up before making all setting page render edge-to-edge
These classes are casting view to LinearLayout unnecessarily. Later we
might change the root view away from LinearLayout. The cast will cause
crash.

Bug: 132182711
Test: go through SUW.
Change-Id: Iea31882f8edea0c87ef8e95b4da9b6bffa8ea7d0
2019-05-10 21:27:05 +00:00
Mill Chen
9770a0bf4a Merge "Update listDivider for PreferenceFragmentCompat" into qt-dev
am: dcf21d4bd6

Change-Id: Id27cbd86701e207774690978538603cdde951fa1
2019-05-10 14:19:02 -07:00
Fan Zhang
7fee27bbcd Merge "Updating animation asset" into qt-dev
am: 5dd9850bf3

Change-Id: Iec18d34de3cb035ac8510eb6e47115db735c9d92
2019-05-10 14:13:28 -07:00
Brad Ebinger
4c032bc6cb Merge "Resolve the SIM call manager per subId" into qt-dev
am: 1350309ecc

Change-Id: I1da95b23f075e6a567737411345d8ed9c0714f3c
2019-05-10 14:02:20 -07:00
TreeHugger Robot
dcf21d4bd6 Merge "Update listDivider for PreferenceFragmentCompat" into qt-dev 2019-05-10 20:38:20 +00:00
Fan Zhang
5dd9850bf3 Merge "Updating animation asset" into qt-dev 2019-05-10 20:24:59 +00:00
Brad Ebinger
cf5a1bf326 Merge "Allow SimDialogActivity to be started for result" into qt-dev
am: d204d6c33f

Change-Id: I18fdce583b7301ab3edd322cdc8e2a4190fc60da
2019-05-10 13:23:28 -07:00
Brad Ebinger
1350309ecc Merge "Resolve the SIM call manager per subId" into qt-dev 2019-05-10 20:17:38 +00:00
Hai Shalom
3fc9dc3ada [WPA3] Fix connectivity issues with PSK-SAE Transtion mode
Fix two reported issues regarding PSK-SAE transition mode:
1. When phone supports SAE, creating a manual saved network with PSK
and manually connecting would cause the phone to connect but Settings
does not display any connected AP. Phone would not autoconnect.
2. When phone doesn't support SAE, phone cannot connect to an AP in
PSK-SAE Transition mode because the framework always targets the highest
security.

Bug: 132278271
Test: Connect to WPA2 network
Test: Connect to WPA3 network (w/capable phone)
Test: Connect to WPA2/3 Transition w/SAE capable phone
Test: Connect to WPA2/3 Transition w/SAE not-capable phone
Change-Id: I371bcb4b2cccfc8684ecb5db3a768524f7354598
2019-05-10 12:59:23 -07:00
Brad Ebinger
d204d6c33f Merge "Allow SimDialogActivity to be started for result" into qt-dev 2019-05-10 19:42:55 +00:00
hughchen
f004450033 Merge "Clear media switcher items when in phone call" into qt-dev
am: 12dcbe7c71

Change-Id: I148a12a79ea4ab36e7fd2d45576c59937bab7b98
2019-05-10 11:44:49 -07:00
Brad Ebinger
d206835fe3 Allow SimDialogActivity to be started for result
In Telephony, we sometimes need to be able to launch
the SIM pick dialog activity for SMS without setting
a new default (i.e. user chose "ask every time") for
default SMS subscription.

Adds the ability for the SimDialogActivity to be
called using startActivityForResult and not set the
user's choice as the default.

Bug: 130853716
Bug: 130567323
Test: run Telephony SmsManagerTestApp
Change-Id: If9f9ebbfe9b7b6718ed759937abbcfa6d22c6295
2019-05-10 18:29:54 +00:00
Beth Thibodeau
94d4f6ba34 Updating animation asset
Fixes: 132095489
Test: mp settingsg
Change-Id: Icda6eb54496356e2567e1d39ab0c718746e2442d
2019-05-10 14:28:43 -04:00
TreeHugger Robot
12dcbe7c71 Merge "Clear media switcher items when in phone call" into qt-dev 2019-05-10 18:14:02 +00:00
Arc Wang
ccd201bc13 Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev
am: 41656de5d4

Change-Id: I2d3954b9f8b3854ca5fcb2995950e89b510fb7a0
2019-05-10 03:42:18 -07:00
lindatseng
5dc7541d0e Merge "Set panel launch mode to singleInstance and fix animation" into qt-dev
am: 04623e81b8

Change-Id: I1733af9f16786102039805e8c0c2015c0aeb7e43
2019-05-10 03:34:59 -07:00
Bill Yi
5d0fbc9f4e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 60252574a2 -s ours
am skip reason: subject contains skip directive

Change-Id: I96bd347be9f9360105c035f45f5174852ed629e0
2019-05-10 03:23:54 -07:00
Mill Chen
e3e966689d Update listDivider for PreferenceFragmentCompat
The support library uses preference_list_divider_material for its list
divider and its color is a hardcoded value. That's why the divider color
can't be applied to the PreferenceFragmentCompat in Settings when
updating the divider color in the device defaults theme level. To make
it so we set its listDivider to list_divider_material to facilitate updating
the divider color.

Bug: 129943610
Test: visual
Change-Id: Ie992b925fae0effd4e00682a911ad004ac3fc033
2019-05-10 17:23:49 +08:00
TreeHugger Robot
41656de5d4 Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev 2019-05-10 09:09:25 +00:00
Kevin Chang
6f95358165 Merge "Override performClick method to eliminate redundant click" into qt-dev
am: 1915fe3b67

Change-Id: I355dec40050ca582ded49841d260a581b16f7aba
2019-05-10 01:43:57 -07:00
TreeHugger Robot
04623e81b8 Merge "Set panel launch mode to singleInstance and fix animation" into qt-dev 2019-05-10 08:41:12 +00:00
TreeHugger Robot
60252574a2 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-05-10 08:38:34 +00:00
Pengquan Meng
c981cf8446 Merge "Fixed network name for about/sim_status" into qt-dev
am: b73d3c70c8

Change-Id: Ie34af12037929038c17d72107ebb23c54bef24ce
2019-05-10 01:36:08 -07:00