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
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
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
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
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
joshmccloskey
fe6784b57d
Fixed spacing on Intro & Edu screens
...
Test: It builds.
Fixes: 132370812
Change-Id: I7bfa8a7eae91ad9b0fc9b19c9a6bc019f884e729
2019-05-11 00:11:02 +00: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
Brad Ebinger
96af57b47f
Merge "Resolve the SIM call manager per subId" into qt-dev
...
am: 1350309ecc
Change-Id: I3d5c730efde6c0a8a1ecdba4e70793696ad7a598
2019-05-10 13:39:57 -07:00
Brad Ebinger
1350309ecc
Merge "Resolve the SIM call manager per subId" into qt-dev
2019-05-10 20:17:38 +00:00
Brad Ebinger
9761dd4634
Merge "Allow SimDialogActivity to be started for result" into qt-dev
...
am: d204d6c33f
Change-Id: Ib448a6901581294050fc988ed9c16f7e93066860
2019-05-10 13:12:21 -07: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
26aa660541
Merge "Clear media switcher items when in phone call" into qt-dev
...
am: 12dcbe7c71
Change-Id: Ieb3326b10dd25c22c9e16286585a6dbdedf2fa35
2019-05-10 11:49:43 -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
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
a8bd70f7a9
Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev am: 41656de5d4
...
am: 3ce4382031
Change-Id: Idd3be7b3e359a0e71bab0afd6ea016dae38f6f17
2019-05-10 07:13:08 -07:00
lindatseng
11cd648dea
Merge "Set panel launch mode to singleInstance and fix animation" into qt-dev am: 04623e81b8
...
am: d40facddb0
Change-Id: I6ae75cbea7463353a62df9431b81660b9c16d2a7
2019-05-10 07:09:10 -07:00
Kevin Chang
529753c9eb
Merge "Override performClick method to eliminate redundant click" into qt-dev am: 1915fe3b67
...
am: 9714ce162a
Change-Id: If9b40d1fe2e44c6f614a6fcff97b34f073f2b254
2019-05-10 07:00:47 -07:00
Pengquan Meng
f44a812872
Merge "Fixed network name for about/sim_status" into qt-dev am: b73d3c70c8
...
am: f7c9da43cf
Change-Id: Id480ee149ec51d52e3d5a705a6201e44b8e953d8
2019-05-10 06:55:47 -07:00
Kevin Chang
d19928b9af
Merge "Improve the Accessibility warning dialog with new design" into qt-dev am: 35890fabae
...
am: 34e42d31b0
Change-Id: Ifdd68f5cd961c1a67a006bbd82b9e794ff55ec49
2019-05-10 06:33:02 -07:00
lindatseng
69b35fe896
Merge "Fix NPE when launching MediaOutput Panel" into qt-dev am: b0f641869b
...
am: f23d16f577
Change-Id: Icb002de55edacad63a1f7f2802d92e72cf2fc0fd
2019-05-10 05:41:44 -07:00
Arc Wang
3ce4382031
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: I9c051a5ecce1e9f0b2d8b58c1df8fbc7721cb8d7
2019-05-10 05:30:41 -07:00
lindatseng
d40facddb0
Merge "Set panel launch mode to singleInstance and fix animation" into qt-dev
...
am: 04623e81b8
Change-Id: I15fe1fb15753bf7ffb4bdaec3f3045a7c3d0aa66
2019-05-10 05:18:01 -07:00
Jonathan Scott
65f6968cb2
Merge "Make ScreenPinningSettings behaviour consistent with LockTaskController." into qt-dev am: c6ebdfe982
...
am: 21bb8ebde2
Change-Id: I8911e9622bdcd61ddcc0f6ae83cc1128cb71e66c
2019-05-10 03:20:10 -07:00
Kevin Chang
9714ce162a
Merge "Override performClick method to eliminate redundant click" into qt-dev
...
am: 1915fe3b67
Change-Id: I3de055284663373d83657334ae120c599682b97b
2019-05-10 02:24:16 -07:00
Pengquan Meng
f7c9da43cf
Merge "Fixed network name for about/sim_status" into qt-dev
...
am: b73d3c70c8
Change-Id: I4163adc7824982b06324335651b8a5c681d6eef6
2019-05-10 02:14:09 -07: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
34e42d31b0
Merge "Improve the Accessibility warning dialog with new design" into qt-dev
...
am: 35890fabae
Change-Id: Ib1ae087015aabe65aefd493374cb681536cbc9ef
2019-05-10 02:03:36 -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
lindatseng
f23d16f577
Merge "Fix NPE when launching MediaOutput Panel" into qt-dev
...
am: b0f641869b
Change-Id: I82e8906d672fce4831dde200073db5b763205bee
2019-05-10 01:30:15 -07:00