Raff Tsai
3c337d5659
Fix robolectric test error
...
Fixes: 132575837
Test: make RunSettingsRoboTests
Change-Id: I5238a3789f5308a489298fadae772b8b9343ddb5
2019-05-13 16:56:05 +08:00
Bill Yi
4d19fd6627
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0abec2cc56 -s ours
...
am: 30715db85a
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
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
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
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
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
2019-05-11 03:41:24 -07:00
joshmccloskey
b4627760d1
Merge "Fixed spacing on Intro & Edu screens" into qt-dev am: 806c65ca17
...
am: 87dbedb514
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
2019-05-11 03:34:53 -07:00
Mill Chen
f78ccde6bd
Merge "Update listDivider for PreferenceFragmentCompat" into qt-dev am: dcf21d4bd6
...
am: 7aa0ab732b
2019-05-11 03:25:57 -07:00
Fan Zhang
8a2ae8cdf0
Merge "Updating animation asset" into qt-dev am: 5dd9850bf3
...
am: b104df9efc
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
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
2019-05-10 22:20:42 -07:00
Kevin Chyn
f4099a8f84
Merge "Propagate intent extras and finish activity properly" into qt-dev
...
am: 7ac16f152e
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
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
2019-05-10 19:50:15 -07:00
joshmccloskey
87dbedb514
Merge "Fixed spacing on Intro & Edu screens" into qt-dev
...
am: 806c65ca17
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
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
Mill Chen
7aa0ab732b
Merge "Update listDivider for PreferenceFragmentCompat" into qt-dev
...
am: dcf21d4bd6
2019-05-10 14:47:19 -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
Fan Zhang
b104df9efc
Merge "Updating animation asset" into qt-dev
...
am: 5dd9850bf3
2019-05-10 13:49:47 -07:00
Brad Ebinger
96af57b47f
Merge "Resolve the SIM call manager per subId" into qt-dev
...
am: 1350309ecc
2019-05-10 13:39:57 -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
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
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
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
Beth Thibodeau
94d4f6ba34
Updating animation asset
...
Fixes: 132095489
Test: mp settingsg
Change-Id: Icda6eb54496356e2567e1d39ab0c718746e2442d
2019-05-10 14:28:43 -04:00
Andrew Sapperstein
32e3664abf
Ignore failing test.
...
Bug: 132441284
Test: robotests
Change-Id: Ib3c7f9854e3ffba4e7e04bfb1fb1763fc77e160b
2019-05-10 11:25:23 -07: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
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
2019-05-10 07:09:10 -07:00
Bill Yi
8aaed6866f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 60252574a2 -s ours
...
am: 9e7e046813
2019-05-10 07:05:01 -07:00
Kevin Chang
529753c9eb
Merge "Override performClick method to eliminate redundant click" into qt-dev am: 1915fe3b67
...
am: 9714ce162a
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
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
2019-05-10 06:33:02 -07:00
