Arc Wang
a7d67bc2a6
Merge "Should not decode Wi-Fi QR code after onPause" into qt-dev am: d50bb09876
...
am: ce9e61ee8e
2019-04-09 04:07:33 -07:00
Clown SHEN
9671f4f3fc
Merge "Redraw WiFi detail page's header icon" into qt-dev am: 740dd43700
...
am: 31d150d16b
2019-04-09 03:32:43 -07:00
Hai Zhang
b56125843e
Merge changes from topic "role-replace" into qt-dev am: 0aa0d665c0
...
am: b3299e654e
2019-04-09 03:28:48 -07:00
Fan Zhang
d532430fc6
Merge "Add null check in UserPreference" into qt-dev am: c11f792795
...
am: 9e9fccd707
2019-04-09 03:27:55 -07:00
Arc Wang
787e37b962
Merge "Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator" into qt-dev am: 48ed84ebf4
...
am: 01a26124d7
2019-04-09 03:26:56 -07:00
Arc Wang
fa977e12db
Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev am: 73f539d296
...
am: ee55582d8b
2019-04-09 03:22:37 -07:00
Arc Wang
ce9e61ee8e
Merge "Should not decode Wi-Fi QR code after onPause" into qt-dev
...
am: d50bb09876
2019-04-09 01:54:36 -07:00
TreeHugger Robot
d50bb09876
Merge "Should not decode Wi-Fi QR code after onPause" into qt-dev
2019-04-09 08:30:33 +00:00
Clown SHEN
31d150d16b
Merge "Redraw WiFi detail page's header icon" into qt-dev
...
am: 740dd43700
2019-04-09 00:35:10 -07:00
Cn Chen
65c3be84f4
Merge "Fix fingerprint screens from "Anything else" screen not applying Stencil theme" into qt-dev am: 6b5d0230b4
...
am: cbd00c32c9
2019-04-09 00:31:59 -07:00
Hai Zhang
b3299e654e
Merge changes from topic "role-replace" into qt-dev
...
am: 0aa0d665c0
2019-04-09 00:26:01 -07:00
Clown SHEN
740dd43700
Merge "Redraw WiFi detail page's header icon" into qt-dev
2019-04-09 06:45:49 +00:00
Fan Zhang
9e9fccd707
Merge "Add null check in UserPreference" into qt-dev
...
am: c11f792795
2019-04-08 22:39:28 -07:00
TreeHugger Robot
0aa0d665c0
Merge changes from topic "role-replace" into qt-dev
...
* changes:
Remove old default apps code and use roles instead.
Move default payment app to special app access.
2019-04-09 05:33:21 +00:00
Arc Wang
01a26124d7
Merge "Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator" into qt-dev
...
am: 48ed84ebf4
2019-04-08 22:31:59 -07:00
Arc Wang
e2b4bccbf1
Should not decode Wi-Fi QR code after onPause
...
Bug: 130141694
Test: manual
atest WifiDppQrCodeScannerFragmentTest
Change-Id: I412fb7c06220c23bddc7b3c448fcc72a00bdecc3
2019-04-09 13:30:59 +08:00
Hai Zhang
22f8d48df0
Remove old default apps code and use roles instead.
...
Default apps are moved into PermissionController.
Bug: 124452117
Bug: 124457823
Test: presubmit & manual
Change-Id: I5f68e5b77cd6163d093590185314270706d75391
2019-04-09 13:30:31 +08:00
Hai Zhang
470ec69461
Move default payment app to special app access.
...
Bug: 124452117
Bug: 124522992
Test: build
Change-Id: I58e7127920d939dc3635bcc2e608cee6baa21998
2019-04-09 13:30:14 +08:00
TreeHugger Robot
c11f792795
Merge "Add null check in UserPreference" into qt-dev
2019-04-09 05:24:21 +00:00
TreeHugger Robot
99c95a3a77
Merge "Implement context menu for ConnectedAccessPointPreference"
2019-04-09 04:49:50 +00:00
Arc Wang
ee55582d8b
Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev
...
am: 73f539d296
2019-04-08 21:19:30 -07:00
TreeHugger Robot
48ed84ebf4
Merge "Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator" into qt-dev
2019-04-09 04:18:09 +00:00
Cn Chen
cbd00c32c9
Merge "Fix fingerprint screens from "Anything else" screen not applying Stencil theme" into qt-dev
...
am: 6b5d0230b4
2019-04-08 21:12:12 -07:00
Arc Wang
4a5ff58511
Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator
...
When scanned a no password ZXing QR code, add both open network &
enhanced open network to configured Wi-Fi network list because this kind
of QR code may refer to a open network or an enhanced open network.
Bug: 124131581
Test: manual
Change-Id: Id9f85ef8dcdf72347be8106938437aecd0eed9f5
2019-04-09 10:36:07 +08:00
Malcolm Chen
9d307ec77c
[automerger skipped] Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED." am: bf857c7374 am: d6875ddf82 -s ours
...
am: e0bc974553a05e6f8182
2019-04-08 19:32:03 -07:00
Bill Yi
1335004812
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 00846385a5 -s ours
...
am: b8678ee1e4
2019-04-08 19:25:25 -07:00
clownshen
6ef1eec2e2
Redraw WiFi detail page's header icon
...
Tint 87% dark in day mode and 100% white for night mode
Bug: 129413562
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Test: manual test
Change-Id: Ia31231ca7871ac4efcea5e1232690ff4374df5b3
(cherry picked from commit 86f65ef488
2019-04-09 02:20:32 +00:00
cosmohsieh
9f8522565a
Implement context menu for ConnectedAccessPointPreference
...
1) User wants to long press ConnectedAccessPointPreference to forget network if this
is a captive portal network.
2) Change context menu string
Bug: 113756562
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: If5c45c45fe126f627eeb53a6c1873a070ad23ae8
2019-04-09 10:17:20 +08:00
Arc Wang
73f539d296
Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev
2019-04-09 01:39:35 +00:00
Xiangyu/Malcolm Chen
568b24f0a2
Merge "Revert switchBar if enable / disable subscription fails." into qt-dev am: 81f31ef4d3
...
am: 9106454fbd
2019-04-08 18:28:29 -07:00
Lei Yu
fef0c2ae71
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." into qt-dev am: 8f45be526d
...
am: afffd04568
2019-04-08 18:27:36 -07:00
Cn Chen
6b5d0230b4
Merge "Fix fingerprint screens from "Anything else" screen not applying Stencil theme" into qt-dev
2019-04-09 01:27:01 +00:00
Andrew Sapperstein
0ac8d0f83b
Merge "Delete carrier entry from mobile network details page." into qt-dev am: b93761d252
...
am: 4bbd1e867b
2019-04-08 18:26:47 -07:00
Clown SHEN
530438261b
Merge "Redraw WiFi detail page's header icon"
2019-04-09 00:52:57 +00:00
Malcolm Chen
e0bc974553
[automerger skipped] Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED." am: bf857c7374
...
am: d6875ddf82a05e6f8182
2019-04-08 17:21:41 -07:00
Bill Yi
b8678ee1e4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 00846385a5
2019-04-08 17:14:23 -07:00
TreeHugger Robot
6a270547e5
Merge "Import translations. DO NOT MERGE"
2019-04-08 23:43:30 +00:00
TreeHugger Robot
00846385a5
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-08 23:37:53 +00:00
Malcolm Chen
d6875ddf82
Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED."
...
am: bf857c7374
2019-04-08 16:06:13 -07:00
Xiangyu/Malcolm Chen
9106454fbd
Merge "Revert switchBar if enable / disable subscription fails." into qt-dev
...
am: 81f31ef4d3
2019-04-08 15:09:40 -07:00
Lei Yu
afffd04568
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." into qt-dev
...
am: 8f45be526d
2019-04-08 15:08:04 -07:00
Treehugger Robot
bf857c7374
Merge "Correct name of PRIMARY_SUBSCRIPTION_LIST_CHANGED."
2019-04-08 21:53:58 +00:00
Xiangyu/Malcolm Chen
81f31ef4d3
Merge "Revert switchBar if enable / disable subscription fails." into qt-dev
2019-04-08 21:38:25 +00:00
Lei Yu
8f45be526d
Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." into qt-dev
2019-04-08 21:28:09 +00:00
Andrew Sapperstein
4bbd1e867b
Merge "Delete carrier entry from mobile network details page." into qt-dev
...
am: b93761d252
2019-04-08 14:04:11 -07:00
Bill Yi
ef1e217daf
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If0ee949c0948860c8a6834fc3b63fa0d9175cfb0
2019-04-08 13:57:43 -07:00
Fan Zhang
f2390512c1
Add null check in UserPreference
...
The comparator can get null objects according to bug report.
Fixes: 130144755
Test: manual
Change-Id: Ic8a332d390f411d2eb69c944fb7fd166d9961535
2019-04-08 13:55:58 -07:00
Antony Sargent
159f011022
Merge "Fix 'Advanced' collapse point on Network & internet page" into qt-dev am: 5c28e42538
...
am: da62a42ef8
2019-04-08 13:25:57 -07:00
Bill Yi
ad91a8b512
Import translations. DO NOT MERGE
...
Change-Id: Ie7a8b551765891732db4bc2e44475f26c8cf5ec6
Auto-generated-cl: translation import
2019-04-08 13:16:04 -07:00
TreeHugger Robot
b93761d252
Merge "Delete carrier entry from mobile network details page." into qt-dev
2019-04-08 20:00:29 +00:00
